Change class-name hyphens to underscores. Close issue #3