Including points

Ticket #28