Merge remote-tracking branch 'upstream/master'
merged with master
changed the way conditions are stored
Merge pull request #18 from wbushong/master

Sorry for all the pull requests!!