Changed version
Merge branch 'devel'
Merge branch 'devel'
incremented version
incremented version number
removed sympy dependency, incremented version
Merge branch 'master' into devel