Merge pull request #1 from ahoran3/master

Merge changes into my working