Made more stuff work
Merge pull request #3 from shiyingzheng/master

Made more stuff work