0.0.3  + some tests