Merge master back after v0.1.1