Refactored project
Merge pull request #2 from AndrewSB/master

Refactored project