almost ready for 0.1.3