math

302fb5fc - Merge branch 'develop' into prime_functions