Merge pull request #4 from hipsterwannabe/ashwebb

Ashwebb
Merge commit '86752107dc1d940f216252d46cb1280850c2356f' into ashwebb