UPDATED: v0.6.1-alpha.1, with bug fixes