Some modifications
Merge with master