Fixed some bugs.
Merge branch 'master' of github.com:o4dev/AroundTheWorld