new changes
Merge pull request #44 from fyounis/master

New changes