Changed header so that swig can parse it better