Implementing #36
Merge pull request #38 from mottosso/master

Calling this good and moving on!