rhysbrettbowen Merge pull request #21 from banguit/master