Add gamestate constructor
Merge commit '1c480b2c16024e4e6cd5b525bcaefc5dd9752a64'
Use new gamestate constructor