Merge pull request #1 from lolomg/develop

Push your finished features to develop branch.
Merge pull request #2 from lolomg/master

Merge pull request #1 from lolomg/develop