Merge pull request #2 from mjollyasu/master

Pulling from origin
Merge pull request #9 from ShaunMBrown/master

Merge pull request #2 from mjollyasu/master