Better error messages
Merge branch 'master' of github.com:streed/pyConditions