Switched to using entry_points

Patch for #15