Add more generalizations.
Merge branch 'master' of github.com:Unclerojelio/SHPATH
Had to checkut makefile to undo changes.