Fixed things
Merge pull request #4 from tazjin/master

Fixed things