Change to the API
Merge branch 'master' of github.com:streed/pyConditions