Merge pull request #49 from daemianmack/master