schierlm Merge pull request #6 from neauoire/patch-6