Fix for issue #13

Signed-off-by: Kavinsky <nmunozfernandez@gmail.com>