Merge pull request #20 from Jonobennett/master