Merge pull request #12 from daniellemayne/develop

bug fixes