Improvments and version 0.0.2