Updated my 0.3.4_dev branch with Steve's master