#8 added support for integers as point id/name