Ghabry Merge pull request #36 from jetrotal/master