Hacky solution for buildproblems
Merge branch 'master' of https://github.com/daniw/fosamath