Merge pull request #1 from xonhu/master

Alma
Merge pull request #9 from gyufasdoboz/master

Merge pull request #1 from xonhu/master