dengste Merge pull request #16 from casouri/master …