Merge pull request #152 from bassamtabbara/master