Fixed the everything
Merge branch 'master' of github.com:FreddeR/AbuHassansBilar