fixed stuff
Merge pull request #12 from jasich/master

fixed stuff