Merge pull request #1 from woss/develop

Develop
Merge pull request #2 from woss/master

Merge pull request #1 from woss/develop