typo fix
conditions editable
minor refactoring to conditions
Merge pull request #155 from dontmitch/reset_conditions

Reset conditions