Implementing SWIG Templating.
Merge branch 'staging'