Copy of Mario Vilas’s Socksi Py branch; tags added