Merge complete

Run nose test and is OK
Minh