Update for 0.6
improve docs and tests