version modification
merged with master