Merge pull request #1 from KurtPrice/master

master@{1day}...master