New version with proper Makefile for SWIG