finished enhancements

--HG--
branch : enhancements
extra : close : 1