new conditions!
Merge branch 'master' of github.com:benphelps/Probably