Update master.
Merge pull request #36 from HassenRiahi/UpdateMaster

Update master.