Merge pull request #1 from surfsnowpro/master

Merge with Upstream Repo