Merge pull request #472 from Foggalong/master

wow. such update. much synergy. so hardcode
Merge remote-tracking branch 'upstream/master'