Merge pull request #54 from antonow/more-bug-fixes

More bug fixes
put USA on the top