Add programme, plus few smaller changes.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
Merge pull request #995 from kwilczynski/master

Add programme, plus few smaller changes.