Fixed issue #17

Change-Id: I2e3baae7eb90778ff2b63ba37738351b1c57dce4
Signed-off-by: Marius <marius.oe@gmail.com>