disallow infinity
Merge branch 'team9dev' of https://github.com/dbeckwith/wpi-suite into team9dev