Updated version (0.3.4)