code refactoring
Merge branch 'master' of https://github.com/aashour/AjeerLink.git