Fix files problems
Merge branch 'develop' into aurel