Merge pull request #6 from Josiastech/master