V0.6 initdev

Requesting merge of v0.6-initdev to trunk to see how github reacts ;)