Merge pull request #5 from christophecvr/master