v0.4

Manual merge of branch