Merge pull request #23 from maddijoyce/master