#6 - Refine code
Merge branch '6'