neilcharles Merge pull request #41 from neilcharles/develop