Merge pull request #19 from irvanmikro/master

beglo