Merge pull request #301 from cpoulain/master

Clean-up