fixed a few things
Merge pull request #149 from HoltMaki/master

fixed a few things