romainfrancois Merge pull request #5 from AdamMJenks/master