nlamirault Merge pull request #68 from juergenhoetzel/master …