conditions
some left overs
Merge pull request #40 from hochang/master

conditions