Merge pull request #1 from annajordanous/master

first pull from fork at annajordanous
tidying up