a few small changes
Merge pull request #107 from HoltMaki/master

a few small changes