jega commit
Merge branch 'master' of github.com:shameed/eware