Fixes: #15

Change-Id: Ic2ac16778e0ac8288c903fe00efa378ea9034ee3
Reviewed-on: https://pirx.atteo.com/gerrit/537
Tested-by: Mr. Jenkins
Reviewed-by: Sławek Piotrowski <sentinel@atteo.com>