Feat/gameengine#15

Feedback?