merged master branch into qphix-tmf branch