Bugfixes
Merge pull request #2 from danjng/master

Bugfixes