math

936e2225 - Merge branch 'complex_gk' into develop