Bugfixes
Merge pull request #62 from josephktcheung/bugfix-2

Bugfixes