Merge pull request #53 from DevYah/master

@sedramina