Merge Virtual MicroChallenge 2 with master