fix for #19, resolved a whitespace merge conflict
Merge pull request #22 from bitovi/19-nonstring

fix for #19, resolved a whitespace merge conflict closes #19