Updating to latest 0.3.8