fixed stupid stupid stupid bugsgit add -A! :sob:
Merge pull request #2 from pezy/master

fixed stupid stupid stupid bugs :sob: