Hassan's Pull Request

I have made some Awesome Changes, check'em out!