Merge pull request #2 from xonhu/master

aa
Merge pull request #12 from gyufasdoboz/master

Merge pull request #2 from xonhu/master