Small fixes
Merge pull request #17 from bbshih/master

Final fixes