Fixes #2
Merge branch 'NewBranch'