Merge pull request #121 from sidschingis/master

fix
Merge pull request #122 from sidschingis/master

fix
Merge remote-tracking branch 'upstream/master'
fix condition
fix v2
fix