bremoran Merge pull request #30 from hannestschofenig/patch-7