merge (w/fix) with master