David O'Callaghan Merge pull request #38 from frimicc/master …