fix logic
Merge branches 'tmp' and 'master'