New version

Closes #15, #16, #17, #18, #19, #20, #21, #22, and #23

See merge request !19