Merge pull request #1 from citylims/work

Rebeccas code
new commit