Updated version. 0.2