Refactored to new more simple data structure for sitepoints collection.
Merge remote-tracking branch 'origin/master'