Cleaned code
Merge branches 'develop' and 'master'