Merge pull request #2 from StevePavlin/master

Merging
Merge pull request #3 from Jamrocklord/master

Merge pull request #2 from StevePavlin/master