Update 0.6.1 from zrocweb