Resolving merge bugs
Merge branch 'develop'