Updating adaptation tool
Merge branch 'develop'