Merge pull request #2 from mjollyasu/master

Pulling from origin