Merge pull request #13 from gyufasdoboz/master

Merge pull request #3 from xonhu/master
Merge pull request #4 from xonhu/master

Merge pull request #13 from gyufasdoboz/master