Working towards to 0.0.2