last changes from nick
Merge pull request #235 from deb-cfengine/install4

last changes from nick