fix
Merge remote-tracking branch 'upstream/master'
Merge pull request #121 from sidschingis/master

fix
fix
fix
fix from fluro push
fix
fix
fix
Merge pull request #122 from sidschingis/master

fix
Merge pull request #123 from Buttys/master

merge