Merge pull request #13 from oxford-physics/master

Multiple changes