Includes fixes for issues #14, #16, and #17