fixed issues from user2
Merge branch 'master' of https://github.com/a-ahmed/site