add documentation, missing import
Merge branch 'master' into kettle-deployment