Merge pull request #39 from daniellemayne/develop

Develop- bugzids 3437 and 3400