Merge pull request #5 from r-darwish/master

Various Improvements