Bug fixes and tidying up
Merge pull request #16 from AntoniaR/master

Bug fixes and tidying up