Merge pull request #65 from rkhatibi/master