Merge pull request #1 from stt/development

Development
Merge pull request #2 from stt/development

Development