Merge pull request #11 from zsmahi/master

I will check them, thanks. Anyway, a lot of strings will be modified in the future :)