new and fix
Merge pull request #181 from sidschingis/master

new and fix