Merge pull request #357 from nexusformat/master

synchronize from master