Readded files that should be in master
removed extra spaces
Merge pull request #264 from MGhanem/fix_master

Readded files that should be in master