fixed #121
bugs #121
fixes #107
Merge pull request #122 from Align/matt-dev

Fixes Issues