Updating to v-0.3