Initial working version (0.3)