tidying up
Merge pull request #2 from annajordanous/master

tidying up first pull from fork at annajordanous