FIxed merge errors
Merge pull request #6 from JamesRottinger/hackathon

FIxed merge errors