9-12 updated & details link added
Merge branch 'leogao'