Merge pull request #1283 from Ayrx/entry_points

Added entry_points.