Removed underscores from function names, closed #22.