Reflected changes from 0.3.9