merge newest from fnksmplr branch