Fixing some stuff
Merge branch 'develop'