Merge pull request #2 from TobyGoodwin/master

Several fixes