Merge pull request #1 from KurtPrice/master

master@{1day}...master
Merge pull request #2 from KurtPrice/Kurse

Merge pull request #1 from KurtPrice/master