In Sandbox: int number_of_building_points added. Final list will contain (number_of_building_points) points.
Merge remote-tracking branch 'origin/master'