Merge pull request #1 from surfsnowpro/master

Merge with Upstream Repo
Merge pull request #2 from shultzam/master

Merge pull request #1 from surfsnowpro/master