Fixed a lot of things - by Ben
Merge pull request #17 from shiyingzheng/master

Fixed a lot of things - by Ben