Updated with latest 30log (0.9.1)