martinohanlon Merge pull request #30 from martinohanlon/dev