Preparing for release
Merge pull request #24 from ahmedlawi92/master

Preparing for release