Prepared for new update 3.0.
3.0 updates.
Merge branch 'develop'