This partially resolves issue #2. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 707a1272fc)
707a1272fc