FIxed some things
Merge pull request #3 from giezenberg/master

Fixed some things