merge latest from fnksmplr