Update, Merged Fadi's code

Manually
Merge pull request #20 from regisjorda/test

 Update, Merged Fadi's code