updated to Alpha 0.1.2