v1.0.0.6

Few changes