Merge pull request #355 from nexusformat/master

synchronize
fixes #353: remove labels (only one instance found for each!), autoreformat reST
Merge pull request #356 from nexusformat/development

Development