Merge pull request #2 from StevePavlin/master

Merging