added some changes
merged with master