math

d9490514 - Merge branch 'develop' into complex_gk