Merge pull request #50 from kuanyili/bugfix

Bugfixes