Anas Awadalla
some fixes
d37faa6