Merge pull request #13 from Aloalo/master

zezrh
Merge pull request #8 from toi333/master

Alo