merge to v0.2
merge v.02
puppet modules used
 merge
merge done