Merge pull request #103 from drywall/master

Bugfixes