Updates and new version
Merge pull request #21 from philipbradshaw/philips-branch

Updates and new version