Merge pull request #2 from surfsnowpro/master

Update from Master
Merge pull request #3 from shultzam/master

Merge pull request #2 from surfsnowpro/master