Working on enhancements for #139