mystilleef Merge pull request #22 from Zecas/master