For rolling and jazzy this PR fixes and supports issue #2
For rolling and jazzy this PR fixes and supports issue #2