Merge in changes from 1.0.4