Version 1.2
Merge pull request #13 from chaabani1991/master

Version 1.2