Integrates merge requests !6 (merged) and !13 (closed).
Implements #1 (closed), #10 (closed), #16 (closed), #18 (closed), and #34 (closed).