dducharme Merge pull request #27 from pelegri/master