Resolved both issues reported in #21