Merge pull request #357 from nexusformat/master

synchronize from master
Merge pull request #358 from nexusformat/development

Merge pull request #357 from nexusformat/master