Anas Awadalla
some fixes
4f35c65