Fixes #20

Also includes issue 16 manually merged in.
Merge branch 'master' into seanmason-issue-20

Conflicts:
	src/com/swtanalytics/math/MathFunction.java
Merge pull request #33 from stepthom/seanmason-issue-20

Fixes #20