Changes from 0.2