Merge pull request #251 from iabdalkader/master