Jan review

cc #34