Merge pull request #25 closed from vprevosto/master