What do you think of this one.  Removed excess swig cruft, 

You need to run 

make swigify to generate those changes.