Review and fix for 12-6
Merge pull request #187 from objccn/review/12-6

Review and fix for 12-6