Merge pull request #67 from mwernimont/master

United States to Nation
Merge pull request #68 from mwernimont/master

too many pretty pictures
code clean up