added rev 0.7