Merge pull request #15 from Hmturner/master

First Draft