Fixes #106
Merge branch 'mansyn'