fixed a few things
Merge pull request #7 from clandere/master

fixed a few things