Merge pull request #78 from ffontaine/master