Rolled back all the changes to prepare the stub.
Merge branch 'master' into stubs
Forget to clean up some comile stuff last time.
Final version of the demo.
Added more styling.
Fix after merge.
Fix after merge.