Brought in updates from 0.3 beta1