Fabien-Chouteau Merge pull request #4 from Patschkowski/master