fix
Merge branch 'master' of https://github.com/nrcharles/solpy

Conflicts:
	tools.py