Merge pull request #5 from xonhu/master

Merge pull request #15 from gyufasdoboz/master
Merge pull request #16 from gyufasdoboz/master

Merge pull request #5 from xonhu/master