Yey things work
Merge pull request #31 from swndr/master

Yey things work