fixes
Merge branch 'master' of https://github.com/iluetich/the_foreign_four