lorenzwalthert Merge pull request #4 from jonmcalder/master