new
fix
fix
fix
fix
fix typo
fix
Merge pull request #225 from sidschingis/master

fix & new