merge the rmframes branch (first V2 master commit)