Fixed issues
Merge branch 'master' of https://github.com/waqarahmad901/auto-management