setup.py has been improved

Change-Id: I3c161fb8146d063c08c3e6a904cd141680a3a005