Working update
Merge pull request #28 from JulesWiz/master

Working update