1.0 version
Merge pull request #7 from Khalil-B/master

1.0 version