Fixes
Merge pull request #67 from lolly/master

Fixes