Changing check convergence scheme
pep8 compliance
Merge branch 'develop' into simulations