fix for #12
fixed merge