uribo Merge pull request #19 from lorenzwalthert/master