FIX: adopt newly changes from gamestar
Merge branch 'master' of github.com:raptor2101/Gamestar