Merge changes from 0.2 branch into master to create a new state for master

Later on chances made on Wildbytes / Brain Games will be pulled into master as well.