from code review
Merge pull request #1257 from jay-hodgson/develop

from code review