Merge pull request #1 from tschiemer/master