Close #64
Merge branch 'NewBranch'