Review/0.6 alpha

when this branch is merged, tag 0.6-alpha