I listened to community opinion and did few changes/improvements.