merge with master.
few tweaks.