Merge pull request #2 from surfsnowpro/master

Update from Master