Merge pull request #1 from lolomg/develop

Push your finished features to develop branch.