Merge remote-tracking branch 'origin' into dev

Merging in any changes from github
Merge branch 'dev' of https://github.com/ezekial4/divFScope into dev
changed compute_inherent_number import line