Trying to get around file problems
Merge branch 'develop'