forked message fixes refs #64
Merge branch 'develop'