Updated with latest 0.2 changes