Merge pull request #3 from mystics/master

Merge pull request #4 from anonan/master
fix conflict
Merge pull request #5 from anonan/master

fix