Close #28. Milestone V0.1