Merge of Pull Request #3 from github.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>