Merge pull request #5 from xonhu/master

Merge pull request #15 from gyufasdoboz/master