Fixing calculate differences
Merge branch 'develop'