Merge pull request #3 from BobWilderness/master

Update 10/29/2014