address issue #89
Fixes #88
bugfixes
fixes #84
Merge pull request #100 from Align/matt-de

Fixes Issues