Merge branch 'master' of github.com:danielunderwood/rendermath