Merge pull request #2131 from JosJuice/gameini-2015-02-25 Gameini updates. (PR #2130 fixed and rebased)
