Bugfix
Merge pull request #41 from alexung/bugfix

Bugfix