Initial update
Merge pull request #26 from AmirolAhmad/master

Initial update