It's bug free this time I swear...
Merge pull request #8 from hughryan/master

It's bug free this time I swear...