Name adjustment
Some adjustments. Now version 0.2