BIGGEST UPDATE 2014
Merge pull request #38 from stumbler/master

Added up to 473