Finally done. This closed #8