Merge pull request #50 from daemianmack/master