Merge pull request #215 from sidschingis/master

fix
Merge remote-tracking branch 'upstream/master'