fixed underscores - closes #47