There are multiple branches with related changes that are asking for PR: #16 #18 #19. Please combine these to a new branch, unifying their changes and allowing code review comprehensively. Please close (DO NOT MERGE) the listed PR.

Please be sure to document, test, and verify package a the end of your work.