SYNR-732
Merge pull request #155 from brucehoff/develop

Develop