Fixed usage of underscore_string. Closes #23.