Close #21, and working on #14