fixed stuff
Merge pull request #3 from pgrennin/fixing-2

fixed stuff