shuky19 Merge pull request #55 from matrinox/master