Merge pull request #117 from sidschingis/master

fix
Merge pull request #119 from sidschingis/master

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