fixing stuff
Merge pull request #26 from eyeman/master

fixing stuff