Fix regression in 0.5.0 related to direct object references, refs #20
Merge branch 'master' into promises-support