review
Merge pull request #4 from CircleCode/3.2/relecture/Eric-Brison/family

review