libmath dependency fix
Merge branch 'varunagrawal'