In process of fixing dist measurements
Merge branch 'master' of https://github.com/saad780/185