First working version r0.1.0