Fixed little bugs
Merge branch 'develop'