Anas Awadalla
some fixes
4db9f63