Enhancements. Issues #17 and #19