fixing stuff
Merge pull request #25 from RAlmada/master

fixing stuff