Merge pull request #2 from linbercsu/develop

Develop is ok.
Merge pull request #3 from linbercsu/master

Merge pull request #2 from linbercsu/develop