make conditions
Merge branch 'master' of https://github.com/djthorne/explanation