Merge pull request #1 from cinder1992/master

Merger
Merge pull request #1 from coreyor/master

Merge pull request #1 from cinder1992/master