Merge pull request #31 from vonfritz/upstream-master

Upstream master