this commit fixes issue #33 @mapk @stefbowerman @finfitty