updated version, almost ready for 0.2