Updated version, 0.1.2