Merge pull request #74 from ZeinEddin/master