fix for #19, resolved a whitespace merge conflict