Merge pull request #7 from toi333/master

wddw
chunkovi
Merge pull request #13 from Aloalo/master

zezrh