Bumped version to 1.1.5
Reverted to Calculate
Merged dev