Updated stuff
Merge branch 'develop' of https://github.com/nhandyal/scia into develop