cleaned a bit
Merge branch 'develop'