cleaning up conditions.
Merge remote-tracking branch 'kazu/master'