Merge pull request #6 from GitNooby/master

got the merge