updates to support prose.io
merge