Merge branch 'develop'
Fixed TODO tasks.

Uncommented bad code.
Merge branch 'master' into develop