implemented enhancements #18 and #22