Merge pull request #1 from ezekial4/dev

Dev
Merge branch 'develop' into dev
Merge branch 'dev' of https://github.com/ezekial4/divFScope into dev