slil
fix some bugs v3
Merge pull request #19 from hizek/master

fix