merging into master

@MohamedBassem Please review and merge