adding feature1

Please review it before merge it into master