jmarcil Merge pull request #74 from jmarcil/master