a quick update and some errors fixed
Merge pull request #101 from daviddahl/master

a quick update and some errors fixed