From d397d505a6043b372815c83b82f17edef638d8f2 Mon Sep 17 00:00:00 2001
From: Berk Onat <b.onat@warwick.ac.uk>
Date: Fri, 20 Oct 2017 14:57:29 +0100
Subject: [PATCH] First compiling version with setup.py without
 libmolfile_plugins.a

---
 pymolfile/__init__.pyc                        |  Bin 612 -> 640 bytes
 pymolfile/molfile/_libpymolfile.so            |  Bin 801448 -> 801448 bytes
 .../Contents/Resources/DWARF/_libpymolfile.so |  Bin 205049 -> 205053 bytes
 pymolfile/molfile/compile.sh                  |    2 +-
 pymolfile/molfile/libpymolfile_wrap.cpp       | 4465 +++++++++++++++++
 pymolfile/molfile/pymolfile.cxx               |  740 +++
 pymolfile/molfile/pymolfile.h                 |   17 +-
 setup.py                                      |   80 +-
 8 files changed, 5267 insertions(+), 37 deletions(-)
 create mode 100644 pymolfile/molfile/libpymolfile_wrap.cpp
 create mode 100644 pymolfile/molfile/pymolfile.cxx

diff --git a/pymolfile/__init__.pyc b/pymolfile/__init__.pyc
index 7ce45ebdb5c41ab0d0c2673da3189b405f237d58..24a3ba9da2eb1cdc0913e40427ff19bd48669b46 100644
GIT binary patch
delta 95
zcmaFD(!eUs{F#?)+UggP$qZ1y%D}+j;K0C8JY}ME4{I(DLln=%Whc~`7#J8zxEUB2
u{0ma^eDibCGILT(co-NMax#lc;tO(0(=+pmHFzhtFy=7@u}*%^SPB4l5E;z?

delta 69
zcmZo*eZnHm{F#^Qdhd(KWCkc;Wnf@%aA064?wcsxGjZ*4F-8Ukh7xWD1_u9v)I8t(
UoV3iGR1KcVvl;Uy^Dz|x0BVvFHvj+t

diff --git a/pymolfile/molfile/_libpymolfile.so b/pymolfile/molfile/_libpymolfile.so
index b4d5f980263403531e0b843e8624ed3a8edf178d..58a54da2b26c083ba1eee9d6189b77aefaa96c5d 100755
GIT binary patch
delta 19344
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
Yg3}+);WlT>EAU8($lNZsp1Y$P0QdSGr2qf`

delta 19347
zcmZ4S)nLU}gAFS<1PrQqLpR0Qbx!;0!dL%||5@`6j`kfKjO{x(nA&%6Ft_jEU}@jM
z!P>rqgROlB2YdSt4v;+O_8lBt3N1`I<=b!daJeZNwiGfjq%kux<dnaNWME)mU}Rum
z&|_p^D9Z%#7#I!~GBBth@h?mdT+e0CC_8;3h|-yU5ky%}7u>*Q&lo;E5JZ(up9rEl
zre6e6)29n=<g#a6K0Odb?VLUlL|vGE5kx(jF1U%yp7HneKoBJ|eIkfbn0^sNxlb3|
z%w^9QGd&PQWlf(5qN=7}1X2Cd1-Ee7GcK7P2%@%5p9rFkPrnGF9!wY9%4N^^X?oyR
zF8xG~5(Wk}eg=jI-#NklQHAmuen9xPQ2qiaKNQMW_z98E1n~tK7&Mr;!1}987#I}5
zEC|s){oz(F`T8j(3=DjX3=C6vAi~R`{8(NHe=C&#AId)p<(u$9<gY^cX8aKTYbaku
z0K)$T<>x^80;Lf9?m_tV460CpKtYHGD=7aYlph4;|AO-Kp?pqZi27D2pIHRLp91Ai
zgYuU``L&`D`R!1?vKWY8&%kgRDlh>oz`$@1%J&rqDPUmu4CNn(@+He4KB$&}$Xi4C
zQ=$9_DF31)M7|QrSCfYDr$G5GAbvdq1H(S3z#@<U0|UbgDE|bMFIo<<P)`P8fCH3o
zCkx>hK>73JA^bWh{~(k<1<IeS2$5d}<##GEFo5i5*b5a{t^`qV3Cdrq4B<b4^3Or}
z-=O^WP(Eh`#DQ~FAnN6z{8v!EC6u453X%7L@}H<e>}N=T3RtK?6qG^v4>TbBZYbYR
z6T+Vd<xhh0H$(Y5p!}0i{yixFHk99`1=0Tr%AckU_CEsyOC`hyLOKuy5>WnsC|?`O
zpQQ_tw}tXG^&tFUD1SYap9bZt=|kkJp!_N*e*%<$s2(b?94c_Y0HR?hlwWQL;a`IC
zUqbo!p#0xZ{!1ud!3d(BsS4sD4r2&k3d#?G@-3kJdQEePf(WR<ObZCV7|NHjgzzUp
z`GQsu{%R<{56V9c<%?QF<ex$L0=5u7Lp8)f-cY_cgkR6F7%E@{5n!magJ|%C@-^%s
z`~)a}K9pY$<zIDx$oE6}icS#z5-7h7%HIv;e|Lt+Uk3B*85rzcAOerT0t^h|?hyVz
zDBlOlm#KmHpcBg1hw{BVAnNU){MAstAC#}{1(8pH@@=8~auC0sk%7S<D$ofMU}Rv(
zgYwrv`TpJz1I|MEhoStpP`;WEM4qV@;y@E$2wxt`FN5;Eq5P!*5c#xP28Mc2*`FQ=
z5vYPHI0EHQfbtcCAo7c#e70Z+e=n5(8p^*6<rjxR<X=Jg9N`c?YaPUa>!5s@I)-|1
z<zpBDQD6d9um#EwhVsq96+8n&Hk5xC%5R7Ao1-B5=Rx@eu@L?aC_gR^!aoh=S3vo9
z>*^scS{@Hk@DZvYE&;-4hstk+@@1j?*hGlDF_bTm1mU|u`GUz1ejJpa0OglK`7$XG
z`IdU9fFo335tPrD22rpJ%7-;-PD1$|&_>P;D1RoD{~XFM%z@}<Zh&}j8I-RG<v)h<
z>rJ2nOL8F^oS}TyJP1D+%5Tkw@Kd4u=}>+Rl)n<n?}PGH3L)yZLivTWA^ek2{`5Iu
zem%oYsKAH0U;&1=P=3||2%ohP;)7#QzBrWsAIjH&@+}rZ)SE*2GoXA|C|`IHL_QYE
zk6sMo*E2BWK?UZ31sE7Qp!^$9{!A!;$`X(U28LBoe)3WXe;<^8e;I^-3Ce%40>Xa<
z<-2W%@P9-3r64}2{t;|~_|R=HM1eMxfBguAZw=*7ItJlKLHS=#L-=`6zSji^zYfZ;
zyA0uPhw^)%{L4`OuFKH+{|i)L)>ViG>1K$7SZ_f1E>OM?l%ERa|9t?FFNN~W9zytS
zP=3}U2!B45zZJ?~3gvS?f!6=qpaQ-xAR10V`Ilcq`1hdvh7S<_XDI(Ll+W4%aq#qy
z5P3-`-|-WKuL9+(|A6pKq5KcOK;h58zz_o!==%*(Py*$%{(<njq5L!`e-D(;#0=_n
zFfhD^@{OT<_Ew04CPDe?Q2t#g-x<m`s%M25kOdXk%K_m}hw`^_Lip#P{A_Lr{~we;
z9m>~fgIKr{RGu?1FxWx)hoO9bDE}FhpA6;K|Kx`lSPB)`Aqe5OLiyoB5dI7(f3q-z
ze-X+*1m(Yl@?SyueC-ei?G%Bi*N5`^#UcC@2)~|T9#o(PBEWDA%AX14mrFr3Y=iPY
zD?s=sq5L085dK{#KUfvQe*@*)Xh8UXpnM5U2w%7Z<iL6c1}&(77Fd9R!5+$whw}ZP
z{BkJ249cGZ<vSTd4BQCiKeUJN4?_8j4iNqYC|}4C!hZ_lgX;eZsK5`903!p#MQ4Zt
zu}+W+85qP}Abc$-U&|fBw}$fVp?rTRe~AY~J|4<n>ILEFL;1U){Dw|w{l6b7Fd3>q
z!Uv*Z5tQEm<!^)XHGCoR$DsVHeh~g|DE|qR&(#I-z%PG@ygHQc6$IhicR}m_#ZZAf
zr~<bTh=OHM{`pV{|2mY<8V2Eif%5kxLHNww5DPCt`NB|sMKVNQ4$5zb@-@4m)um(#
zM1eI_K|v~n?+fJ%r9t?qP`+9^gkKEh=Vd|o?NGizE`+}X%2$W-_dxk;p!~D-P=U)(
zfxA$?LjlBqUr>H#5rogv1M%SuC|?%Je+=d8LitQ35cM`t{*qb<KN8Bn(E#DsmqP`t
znjr$cQ2v7s2!9EbpVI^3?}hTydLjJtP`+$Gg#QT2mzfCRi}ykttPSPsL;1lFem#Q^
zRN%@~h=xokKX)dCKL^UMf$}#)`R!2tQz-xW9EkegP(J@$2w$uZ;sBm`5WW?Z-vH*<
zGcbfg1xgk|6cj-DbC*E)-BA9{r4aspDE|bMe;vxd4CTLr@_$45Ed3A%$Si~CSAg>W
ztYU=Jzcx?->(vki5m3JUItafT%D=l6!e0dCe}eL_LHUf^Ao6dad`&2ydjiA(9NQuC
z>QH{_4n|1*>kJiW-3L+N59Pmt@*|;qw*3(Kd?>#k%5R7A=R^5(p#0QB5cQj({0C6}
z9w=Y-Fe9Y?JqHzNKMc`uAIfh&3gN$m@;5>GzoC4UV-R_Ui4Y$KABXVyp!_#bzC4uA
zcM2k}59O~o4=R5d7#N(O0!uGI6a+x|Z=n1{DF4evh<rYj|LqclUj^kSU54;Gq5Pvz
z{&Xnc?FvMG6_mfb{u)GJJ5)gbCWL<q$~U_U;opPu4IV-Gub}+z&mjCCP`=9x2%mit
zBt*Wxg7Af){OnH<z9y7kKkqX{z!EC(8_ExX^2NVG<a42Xp??s58<gL}zyxk0&4Kc-
zGDG+~p?q0R2>(2kFCz%yKY;M-8RSJF0-qoP3@^kWe3r=&AH0`>@TH;rOkD`y49btu
zgYZ3|{N2V7ems<a0m?6j@_#`2Q^5Rs1_otwh=yZe0R{$BdkFt7l<x)Q3r>MJC=$xo
zfbtumd>1I6*9D?K0m}Dsh49Ov{CFsT4Tuj)fB8^>BOn1r28QWS{v#;A%nf3|e<;7#
z9m1EH3UN?}7ldyJ<<E!my`X#}Z-{&|ly3v&&z%ab|0h5Nwm=oEg7Qy8`Rk$l$58$j
zDE}9fe+SAJnFeu?q7TGE9VkBt%6EYBQ+y%v`O~2F|5T{JB&Y(#0EmKRQ2s6`|0I<E
z8_ItQ<*yEesArrGae#3Ugf9){zlHLBpnS_Ph<w>}X#KAo4iQ)aRj?7tzX0Xmi-5>~
zhVrZ9AbiCc5DQHcA$(gX-#Hn=&xZ0Rq(S(-Q2yR@2!CZgRNz$xMBogRAD<23e}MAS
zpnQ&*5DU*h`KnO9c@9LqBb2`Y$}fWQ{R$xR-B7-JA%tJQ3@X4|0ueY2<@Z4Ox1oHu
zQi%L_D1S>igfBe{;-K5j5WY8*&({j!S3~(*q5RcQK1U~5zMf$tRKO4-z;FP{cZTxM
zL-`R<{(UHaRu|X+hF4JjN+_ReHpD?2x*_t?Q2y5*2wx4#ckTu8>lqk~p#lwH0R{#~
zDE|bM9{}Z>^?@`nFl0gb6;OT^lpoa(k#C3cJtjc-^P&8+Q2que{|kr@s{al{1;Qpl
zG+c-B<>x{8@1Xp4DE}XnzZA+BoCERk?F|t1%259G%@DpZls|V1gzp69*KB2i)c=7{
z0i$gY1@Tb+j$IIbDwO{a$}ffT#dkyGJE44gD1QNzUvmf|zZ%Lv1?BIA@+A&4f&9<F
za11ICdKjYN9+dy<2!#I;%C9>L;WNyI_;|)K2%itizYFC{L;1GHA@bT#zSRi`-ww)O
zeWD&B5C#>v165E8<!?R-k#C3c+fGCH^Pv2-w;}v3Q2wbG5dI4&|0b0GAIfKZ36WQs
z2k}6AJygH}Dj@y_q96v!cY6!r7eV>?P<|(rzX8f$2<88S@^?Y`67M1UZ$SB>Q2ui$
zzdri|M1kmhh>Pxhgz%l9{Qut|{5U9I>L-NX2IXIc^5;YOuD>Ai+oAmVQ2t9OzwHl1
zUUC80zIul3PysK90E5&&h=Oz|fBJt2zaPr?W?}|6IQByM8<`>ehfuyLD}?_K%HP5U
z;d3kmTgY$$%2xpM>lqjxKn0A!0t^hE91smQP<{uL?+fMYa6;tcq5OGJemRt{&IOTg
zg7UpYA^bilzZJ?~0OEt{|C3@61?xZpj0_B?#UcECQ2uf$2>&XSuP+DTKY{XRC_wn{
zp?nra2%m8g#K)Ct5WX0cU#t${>nwuS|KFhk?ob6YG$9J&q5K0-{zNF>$`B&I4$Aj2
zg7A+)`L$5~V<`W&F+`qoF~mU<CJ?^$Vrcz;%N!!$16A+?%8!Hc|3dkNP=3E9M13Qa
zzr_l|p9<w$T0{6Nq5Ms@5dJ|Ze>;?aeKEBDKWqn4@CB-X%^t#6T>^2jBa|Nw<@0(%
z<lCTp4=8^*lwSqqAAs@?Liw+t{2DKaeyRGU5DV-BAp(w2erphfp9JMU41@3+p!|6e
z5dJJEe;1U063Wktg2;b|@-Ie1`25Qt_F2V1`1Nj3felcB0w`ZB7NTGalz#xq{{iK1
zj)TaHE{7OcSq$OpK>2-8ej=1V7s{`M@{dCJ^$gRX0^+3*19n3BYEb?)D1UA>ME((!
z{|3tc1?7K(@_AN393)Z$Q7;4K$3ywLP`+g?NWPwd!44{rTL%(gU<iWp%Nim4Y$*RA
zlwSkoD>p&pd!YOktq}ffC|{!k!e0;N%k)9`7oq$h5Fb?ky@3jR2MI7RFo>>%_`ts(
zqQMQyUj*gHL-~iG{BkJYcmhQIG$=m-%HIg(D@=sQUxM-vO=O1D|No%^7Ly<fv{peJ
zU^yAWcZc$Yra<^<P<{fG-w5TungNlY2jyGNgz&dP`PESVM<{>kLS~Tv85p!yLoDQ5
z2GNiL<!@gF;ZKJ0KdgrES3~(?Ya#smP`)aZ{|(Cbh4Q7>K+L}k<(otKr5oxY1_VO|
z)HXr*Sx~+;ls^y3_k!}bLit5d{zWL?Vhcq7TPQzcD}>Lw7UF;jP`(nB|EwM=;0P7i
zdI6%L7|Jid0pTx&@^3za@V7zv-=X|tP`==Ei2Q9Re<PIt8p>yS0g?X$<=5-Hgb47j
zgSas7HH5DW<v)J|;Tu8ubKXMuZcu*idk8-e%3lcOCqeliq5J|U|L_Nh`dSFTo<Zs(
zM4%5Mz|aik&x7*6L;0Jbe5;=j^}C_`$58%hD1X^6i2MsEzwkGN{~gM={R`o<tp|Cy
zo`Ip`KSV$TEWp5!#moY3V8}uFA}kQT9+bZZ%6EhEc~~Lx;ZVL5l%E3SZ)S(c7eM(R
zI3fHF5Fb?kD{(;tHi85g85lgE{IgJgH<bS$$`=%asF&FQ@&N+_hd6|<1Ley?`L<BL
z5|keZ<rhmp)F*6!*8jbd5P^KC0x=l~zaGjz59LpX^8Z5ltDyXc@(}e8p!^R|{x2y1
zH<T~D5#nHF1&DgXjnMjkB2>U1s=!hSq97N_?^c2E7eV<?wITeSQ2s9{{{xiIsRNPc
z+61xC5X#qt^4p+%k4@0}Kf)NIApxqO0m`2Q<zF+0$ghX;A6h{8hoJobQ2q@lU(^aB
z{~pRuvWD;(H$xnBzy`vXs)q_Zg$npX`Cp*?bSPiO7NTJSl)n?oUkl|II6~x4LHU1O
zAp8eVKBpIi{|n0R^?~r~1-3w3^cpIl4&{G<@@=8~3qcSK!BD<lFod54<r_o!4N$&+
zI7EISlz%n~!ru+$KZfw@8SX*_+~Oe$en9!E2@pQtR)_;DQy_c|DF1I7gl`AsN2f#h
zp-_GTl%EadJLE#-8=?GpV17LV!wjgvVz2-M!)7R7zYwC~Jd|Gz<-dgT9V;R7-=O@3
zP`=<ch=V`ZK;$){{D4{r-vP?s58{LBzc8r4^m>SbJSe}X0m5&A@?SyubD{kAQ2r_?
z-@g%}{y3DM*AC&|hw}M4A$+Fo5C>lDVS&{Da!`R8y$}T^Q2sY4-v`S74dq8d`O$q4
z^`Mmupn2sl6CwN_s659E2!9=vzjHQ(e-g@XpTh$3KLf*ksKC=X5Cxy1{8vyu+YX3}
zFD-<~t3dfPmqPf~Q2u%-KMKlsUjdOXg7Vc?Lio#|eCw6aAm0lWNP{Z)4&`564bdRH
z6XJjmYax6KC_ii+gr5fGFNN}(p#1ZjA@X~m{F_kz6DYs2ehWmwAE>}PC|_?E#6pW5
z5cxPLzY@x?hVpMf`E#Ir<(&}qN1*)4dm#KzQ2wU95I+BIi23y@2Ot6(P=S6ZKLN^j
zJp_@T2;~<-`3Io<kYf<}r%*oo2?$?u55xj7C|@7SH;3}QA^duVV<#aR3LpXuoTniC
zb|~Kp%3lfPSDt~$UxxDkoP+Q`LHX~`L->4qAr8p94&mED`RDIJ_{Cs;Jp)7EBZ$C4
zumA%?-D3!U6O_Lc%0C3<ABOU;LHQw1AnIR3`K?g?KPZ3cQ;0m@K8S;apF#MtAU>%6
zUj`L01POq~|6f5ActQF5q5Nzp|MnY*d>xdp{uaXD3FX^C`LCe-Q&2wNeux8ZLHS1e
zq4j_IJBR_UPzBT8L-++yzSJiOe+rbZ0p+iO@=c)p%TT@-l>ZOPuY&T$4?r9+1Iq6_
z0ImOpK0_?H0#)Dy<qIE#XgCJt8$<b@p!_~4-|Y)TzwIH2`YtG+^)Q6b^%Ww&0LmAE
z@=qOx*8fUSfiF-622j4-5r_eHP`(G0?*rvGL-{RG{y`}J2$ZjW6r$hr8^i$xP=4DF
z2!B^SRN%~Ch`=2v{{<5(xDjf03}QeiGlbs^<xgRS@b5wSH`pP3mg5lh2^<i<4wSFK
z3E>Ap`BhMUeHBz7o(rO2I+R}_4&fJ`fEc(5%9lF{;af;R<Uc_9Mv@Tzfm0CqHYh*h
zG=zTy%D)QbGf0Eg*E8szfhgE50~TO#g7UZ9LHG-x{MlX*{#hu0rXPg=3d&y*2jNSf
zg_xI<2I1R6`IDghC@6mlm|xGpun;OR6)eEO@EXcr2IcdegBZ9A$~S`Y_dxj(Q2qrd
zzY@y71m(|x@~=Sod!hVmAU>%6y9E_^01{weVE7B=|A6up&qEx*ln(KcJCrX4<!3<o
zDo}nml&=TnuYvL{p!^F^en2`ar2f~s0I?tes-O+ZFN5;eLHXTKzSu>G`e#sn9+WSa
z0de3?D1RN4{{zZ5%7n<LU4rO0$z%ojpMl{%R3HzkK>jjBfm9AegC~@)0p;^ufymcD
z`QA|eHYmRn%KrxCe}wYmav|nrU4`gBmRk=IcnB5H%Y*P`uR#=C%7^gNq5QH!2>&LO
zZ%_o`i(QAPzfuh02SfRrN+J9TC|{}q!k-W2JJdr3PCx~2Rzei~hVol#A$-jn5DR|P
zLHO=azFY%@p919<LHUhPehrjA56a)u2vPqM%C9eJh6tG7gjjH(1;THK@`G9-{3}rY
zKPX@E7DRnn8$><_%4ctf@Q*|JC!l=m+Yt3x9T53G2)~}eqz59PbqAuLbqa)^2Ia3=
z0O9vR`9=#N{OeGD%wh=N?=D3DtECYBNhn`s8HE1<%AW}3OWXsguV-M`4i&Hm3otP3
zTMp6C59PD0fbfIvgETNObV2!24<LM|l@R$pD8FDGgwOC0B7bEAgkK8f^K6CimxK7A
z`v2y3h`@c203!oK?p_FA;St1u-De?uA1L4ICWPM#<=?#r;qQm?O&>w{uc7=mk0E@<
z#}M;mo<R75kD>MdcBp_pRKa5?-wDcBc?!`G4&_gM4&fI-`6}-q{1zzR0m`2N<@<ev
z$S;TT=ly{2cRhyI|9AdE1dc-$+=cS*LHT!B*}%2oM<{<YJA}{v1mYu6ZU|o*%74iV
z;p;*99{do#EtH=m0O1Ebf!6=dLJ)yisDexp2tOanj}(LO8=?F>2?&2OlpiAr;je)5
ze@Q|3`=ESFc?ka$lpg}+U#*7<oP`QJh4Ra^AR4|w`BJ(NKHpP_kG-LM1t|YIl&=fr
z=UYS6XF&O%q5PRpzK0z|zWxMM;GjK3;3kxR1Iqsa<!^C-$ZI@<IN*m1gdYm!bGkwJ
z%~1Y(D1Q}{f5{ype+<eG@Bs7c86JTIm>3v%yubnsZ$W%!28I(p5I*;F1_nN628Pd2
zzBY)@#=!6(2_o+T<$r|o6QF#CWQcq(l&=8g?}73i!2Eg!hG$TL1h4=DgX{|i20k_h
zhK3Y~0lHAWLmGr{4&^swK=|%ZzC#v-9|+|$<Usf_P<{fGUkK$Z<gr24|J6eU910*B
zx}p37Q2ul%{{fW08p?Mlf~emO<ujB(_(x&<G6?@Flz*Tc!oLsYFQ{aL)c;?g0t(d-
z1)MJ-A@HCE!WW0~73v{;btwNq1B7n~<uf!x_>NHifffkg8_I8JgYcuFe1{G;Nd2D*
z6=3LsC@6*U4|GHL^-z98FNEI@<va94_%oq=hKUgVIw=3ZBnW>Gl;1D~!aoD$J4}Q6
z=o(a@U<O3NPbj}1$`^VC36TR(zC4uw0Ls^a@)>4A^m{=03Q&Fql<xrLcR~3H^-zIT
zP=N+0|2&kx0m}ab<zImEMP5T3^a08@fbtb)K^))!<v*AW;d_DjybKHuy^!6(p-_JP
zfe8?S1gL<+6bL^H%0Dn2!mot#9cDxLEl@tgd<cIAl-~g5FNX3N7DMFMLHP~KApD&W
zemw)jDu}=dhyX*wS_mJs_k$0#>3AcAe-9?V1;T#`<umMn@V`L$4Z9)y|4=@|eh6Ri
z4Fdznyap&=3Cyo&U`RLsQD6ubU|@J~7{a%K@)sP3@Z+I;jS~=l6O`|862hMc<p)6d
z`=I;`DE|SJ-vH$^yk%hEtLJ54m;n_~1qtvnFl>PGJ)ry(P<|Ga{{YHwgYrK>`HP@@
zg;Nj*9fI-$p!_FLegl-x@(xu0gDiv!Xug94(E}*o2g(;X4KXke%6EYByP*68D1S1P
z?{FESele8Ka0S9&2jcTFFf?3;@DIEL)&G194D+A@m!JyvK>1Ig{O3^qHz=Ru2E+i4
z_Y4etd<+a~P`(tDuLb4nK>49iz8#dm1<DV2532w97#J==1(Ki&{zCaBP`<`Zh=pxX
zelV0j1Iph7<*$PB??U-|q5K86Ao?#r`KO`$$MsMFf!h!T-=KUwD4+8K#D^YtA@VX%
zegl-R59P182a$Jz@=rX3@I#^e&rp5_l<)8eB41w(6<7cj=!5bjo<I~Vgz`O}Lik&t
z{9-8oIFvsR%D)BWPk07V{}#$$2jw$-gm~x-gkR4f3>A=g4$+_r<(EVG=1{)I3y8cY
zlwSqqM??9hFCp@|Q2qxfzaGk;@d_e85z5~N=GQYYEQSg&yoM;)3gvr1`NyIB4R0ax
zx1jt5?;!lQQ2stBpWze4hcBUgVGy66fkELtM7<7_&+vg0QvXLn1sp&E3=9l?P=3Nk
zh=$!z{sJifER_EM%6|prGkk)mXZp;*z{k(PumH-Jg7OtUL*(_K`~zP&A@#olRA9k3
zh=Nck{{obs3*|q6@|&Q11?bTfv!HwfDE}~&p8(~*f%0KTS#W-VIFR87C#3#YgbKjU
zvap2mVP{$RLiq=NK^&M2<v09+@Jm5_0S1N>j9lP;LMxPi63U+n;tMh`T!8X7L-{ut
z>meF0Lj@i{6?}y9UqJbSUl|zq1Q{4UK=}$#{tqbM8_H*Z9=4GO<#Ry!lc9V8D1RxG
zFHsK_I0+R{fb!o!`LNSF{z3T$P<i%m5C>U6`36wF1C$>D<$FN+Wl(+qlrQt0fq_qm
zfuTMDD&PYZU|@lSNDY*~fEB`@4COz7@^?Y`4eSv46HxvF4ha7Wlz)H|!oLIMKj4D!
zUqJZv3=BLFfe#P?1_fRS{|}V!zz5-T{D8PPfgi#bfbtszAbc4pe}N!`uL9*C5Q6Y^
zp!^5I5WW?d4@!Tc5CJE!00V=97=-T!<vWN&_+e0ff&_%01?4wLLim+X{sJiozXQrY
zAPwP9f$|^7K=_M5{CXh<1_n8Zz&enC5CemPJcPds%6CwJ@DD-x35pQ@IVitD3Btbx
z<u6c%@Sj2X2UH;Z?@;~&RS2KsC#e1hIY1pEAo&v##0nY^z7~}4pb6nyL-`3>5WX{%
z-=GcQ`#|{%p!{$s{{WO959L45fvC^^39A1=4$y-LltUFL=tKC;P`-l!gx?M2Cm2Hb
z)1mwZBM5&nl)u0j!e0&LA25ONw?p|4Od<TkKSA|B$N}aMf%8xW3KkIlZ7AQt62gBB
z<tJD{`0t_o25SiaAC%8v1L1T1f`+Iqgf9l=JJ><^O7&2I1bc{pCyeh8;b+76@eqD7
zl;4m5;a5ZX3lbsxb}0Wq5`^Cm<v&P<@MlB$45<)){c@;)LK;M1GnDU;4&m>H@)I&3
z{Nqr5LnefO9?D;k1>s+Z@(*M~`1hgw2RRV_b10u756rJ;cn=j&$Oj8Be24NK3LyOd
zP<}!ogwOXI5~K}95WW<Yzn~bxSA+5oltB1;Q2v8b2;UmYXDA2p>lql_paKdNAOQx3
zS5UqKl>Z6JPpE{*|AO)xsvvysKMV|f!VC-@)eycBl-~p8M?(1%p!`}We+q~n!oa|=
z3@R`KB*4JHa1zR&1La?a@)tn)41XaOE`joeq5Kt4zUg+y|6JGSvW0r*7$;Y4mz&Fd
bRB-y!b=;<Gm5Ih?krvw()^m4&c1HjJ6iXs9

diff --git a/pymolfile/molfile/_libpymolfile.so.dSYM/Contents/Resources/DWARF/_libpymolfile.so b/pymolfile/molfile/_libpymolfile.so.dSYM/Contents/Resources/DWARF/_libpymolfile.so
index f696c0387ac67ebcbc641fefad14c1e81c318b5f..3cbfdcafecc3590c00907a06cf45670975f1ec57 100644
GIT binary patch
delta 3977
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
S-khE;&-|Nl@$_T`=4k-3l!>hX

delta 3910
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
Yeoc;f3gh+Z+49W485d4ZS74q70Qne&Z~y=R

diff --git a/pymolfile/molfile/compile.sh b/pymolfile/molfile/compile.sh
index b04a1dd..3cf2764 100644
--- a/pymolfile/molfile/compile.sh
+++ b/pymolfile/molfile/compile.sh
@@ -10,7 +10,7 @@ g++-7 -fPIC -Wall -Wextra -shared -g -Wunused-function -Wunused-parameter  \
     -I./include/netcdf/include \
     -I./include/expat/include \
     -I./include/tng/include \
-    libpymolfile_wrap.cxx pymolfile.c -o _libpymolfile.so  -L. \
+    libpymolfile_wrap.cxx pymolfile.cxx -o _libpymolfile.so  -L. \
     -L./lib/molfile_plugin/lib \
     -L./lib/netcdf/lib \
     -L./lib/expat/lib \
diff --git a/pymolfile/molfile/libpymolfile_wrap.cpp b/pymolfile/molfile/libpymolfile_wrap.cpp
new file mode 100644
index 0000000..21fbdd1
--- /dev/null
+++ b/pymolfile/molfile/libpymolfile_wrap.cpp
@@ -0,0 +1,4465 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 3.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
+ * coding conventions designed to improve portability and efficiency. Do not make
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+
+#ifndef SWIGPYTHON
+#define SWIGPYTHON
+#endif
+
+#define SWIG_PYTHON_DIRECTOR_NO_VTABLE
+
+
+#ifdef __cplusplus
+/* SwigValueWrapper is described in swig.swg */
+template<typename T> class SwigValueWrapper {
+  struct SwigMovePointer {
+    T *ptr;
+    SwigMovePointer(T *p) : ptr(p) { }
+    ~SwigMovePointer() { delete ptr; }
+    SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
+  } pointer;
+  SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+  SwigValueWrapper(const SwigValueWrapper<T>& rhs);
+public:
+  SwigValueWrapper() : pointer(0) { }
+  SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }
+  operator T&() const { return *pointer.ptr; }
+  T *operator&() { return pointer.ptr; }
+};
+
+template <typename T> T SwigValueInit() {
+  return T();
+}
+#endif
+
+/* -----------------------------------------------------------------------------
+ *  This section contains generic SWIG labels for method/variable
+ *  declarations/attributes, and other compiler dependent labels.
+ * ----------------------------------------------------------------------------- */
+
+/* template workaround for compilers that cannot correctly implement the C++ standard */
+#ifndef SWIGTEMPLATEDISAMBIGUATOR
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# else
+#  define SWIGTEMPLATEDISAMBIGUATOR
+# endif
+#endif
+
+/* inline attribute */
+#ifndef SWIGINLINE
+# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
+#   define SWIGINLINE inline
+# else
+#   define SWIGINLINE
+# endif
+#endif
+
+/* attribute recognised by some compilers to avoid 'unused' warnings */
+#ifndef SWIGUNUSED
+# if defined(__GNUC__)
+#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+#     define SWIGUNUSED __attribute__ ((__unused__))
+#   else
+#     define SWIGUNUSED
+#   endif
+# elif defined(__ICC)
+#   define SWIGUNUSED __attribute__ ((__unused__))
+# else
+#   define SWIGUNUSED
+# endif
+#endif
+
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif
+#endif
+
+#ifndef SWIGUNUSEDPARM
+# ifdef __cplusplus
+#   define SWIGUNUSEDPARM(p)
+# else
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
+# endif
+#endif
+
+/* internal SWIG method */
+#ifndef SWIGINTERN
+# define SWIGINTERN static SWIGUNUSED
+#endif
+
+/* internal inline SWIG method */
+#ifndef SWIGINTERNINLINE
+# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
+#endif
+
+/* exporting methods */
+#if defined(__GNUC__)
+#  if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#    ifndef GCC_HASCLASSVISIBILITY
+#      define GCC_HASCLASSVISIBILITY
+#    endif
+#  endif
+#endif
+
+#ifndef SWIGEXPORT
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   if defined(STATIC_LINKED)
+#     define SWIGEXPORT
+#   else
+#     define SWIGEXPORT __declspec(dllexport)
+#   endif
+# else
+#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
+#     define SWIGEXPORT __attribute__ ((visibility("default")))
+#   else
+#     define SWIGEXPORT
+#   endif
+# endif
+#endif
+
+/* calling conventions for Windows */
+#ifndef SWIGSTDCALL
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   define SWIGSTDCALL __stdcall
+# else
+#   define SWIGSTDCALL
+# endif
+#endif
+
+/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+# define _CRT_SECURE_NO_DEPRECATE
+#endif
+
+/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
+# define _SCL_SECURE_NO_DEPRECATE
+#endif
+
+/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */
+#if defined(__APPLE__) && !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)
+# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
+#endif
+
+/* Intel's compiler complains if a variable which was never initialised is
+ * cast to void, which is a common idiom which we use to indicate that we
+ * are aware a variable isn't used.  So we just silence that warning.
+ * See: https://github.com/swig/swig/issues/192 for more discussion.
+ */
+#ifdef __INTEL_COMPILER
+# pragma warning disable 592
+#endif
+
+
+#if defined(_DEBUG) && defined(SWIG_PYTHON_INTERPRETER_NO_DEBUG)
+/* Use debug wrappers with the Python release dll */
+# undef _DEBUG
+# include <Python.h>
+# define _DEBUG
+#else
+# include <Python.h>
+#endif
+
+/* -----------------------------------------------------------------------------
+ * swigrun.swg
+ *
+ * This file contains generic C API SWIG runtime support for pointer
+ * type checking.
+ * ----------------------------------------------------------------------------- */
+
+/* This should only be incremented when either the layout of swig_type_info changes,
+   or for whatever reason, the runtime changes incompatibly */
+#define SWIG_RUNTIME_VERSION "4"
+
+/* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
+#ifdef SWIG_TYPE_TABLE
+# define SWIG_QUOTE_STRING(x) #x
+# define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x)
+# define SWIG_TYPE_TABLE_NAME SWIG_EXPAND_AND_QUOTE_STRING(SWIG_TYPE_TABLE)
+#else
+# define SWIG_TYPE_TABLE_NAME
+#endif
+
+/*
+  You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
+  creating a static or dynamic library from the SWIG runtime code.
+  In 99.9% of the cases, SWIG just needs to declare them as 'static'.
+
+  But only do this if strictly necessary, ie, if you have problems
+  with your compiler or suchlike.
+*/
+
+#ifndef SWIGRUNTIME
+# define SWIGRUNTIME SWIGINTERN
+#endif
+
+#ifndef SWIGRUNTIMEINLINE
+# define SWIGRUNTIMEINLINE SWIGRUNTIME SWIGINLINE
+#endif
+
+/*  Generic buffer size */
+#ifndef SWIG_BUFFER_SIZE
+# define SWIG_BUFFER_SIZE 1024
+#endif
+
+/* Flags for pointer conversions */
+#define SWIG_POINTER_DISOWN        0x1
+#define SWIG_CAST_NEW_MEMORY       0x2
+
+/* Flags for new pointer objects */
+#define SWIG_POINTER_OWN           0x1
+
+
+/*
+   Flags/methods for returning states.
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
+   that tells if the conversion was successful or not. And if not,
+   an error code can be returned (see swigerrors.swg for the codes).
+
+   Use the following macros/flags to set or process the returning
+   states.
+
+   In old versions of SWIG, code such as the following was usually written:
+
+     if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
+       // success code
+     } else {
+       //fail code
+     }
+
+   Now you can be more explicit:
+
+    int res = SWIG_ConvertPtr(obj,vptr,ty.flags);
+    if (SWIG_IsOK(res)) {
+      // success code
+    } else {
+      // fail code
+    }
+
+   which is the same really, but now you can also do
+
+    Type *ptr;
+    int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags);
+    if (SWIG_IsOK(res)) {
+      // success code
+      if (SWIG_IsNewObj(res) {
+        ...
+	delete *ptr;
+      } else {
+        ...
+      }
+    } else {
+      // fail code
+    }
+
+   I.e., now SWIG_ConvertPtr can return new objects and you can
+   identify the case and take care of the deallocation. Of course that
+   also requires SWIG_ConvertPtr to return new result values, such as
+
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
+      }
+
+   Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
+   more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the
+   SWIG errors code.
+
+   Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
+   allows to return the 'cast rank', for example, if you have this
+
+       int food(double)
+       int fooi(int);
+
+   and you call
+
+      food(1)   // cast rank '1'  (1 -> 1.0)
+      fooi(1)   // cast rank '0'
+
+   just use the SWIG_AddCast()/SWIG_CheckState()
+*/
+
+#define SWIG_OK                    (0)
+#define SWIG_ERROR                 (-1)
+#define SWIG_IsOK(r)               (r >= 0)
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
+
+/* The CastRankLimit says how many bits are used for the cast rank */
+#define SWIG_CASTRANKLIMIT         (1 << 8)
+/* The NewMask denotes the object was created (using new/malloc) */
+#define SWIG_NEWOBJMASK            (SWIG_CASTRANKLIMIT  << 1)
+/* The TmpMask is for in/out typemaps that use temporal objects */
+#define SWIG_TMPOBJMASK            (SWIG_NEWOBJMASK << 1)
+/* Simple returning values */
+#define SWIG_BADOBJ                (SWIG_ERROR)
+#define SWIG_OLDOBJ                (SWIG_OK)
+#define SWIG_NEWOBJ                (SWIG_OK | SWIG_NEWOBJMASK)
+#define SWIG_TMPOBJ                (SWIG_OK | SWIG_TMPOBJMASK)
+/* Check, add and del mask methods */
+#define SWIG_AddNewMask(r)         (SWIG_IsOK(r) ? (r | SWIG_NEWOBJMASK) : r)
+#define SWIG_DelNewMask(r)         (SWIG_IsOK(r) ? (r & ~SWIG_NEWOBJMASK) : r)
+#define SWIG_IsNewObj(r)           (SWIG_IsOK(r) && (r & SWIG_NEWOBJMASK))
+#define SWIG_AddTmpMask(r)         (SWIG_IsOK(r) ? (r | SWIG_TMPOBJMASK) : r)
+#define SWIG_DelTmpMask(r)         (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r)
+#define SWIG_IsTmpObj(r)           (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK))
+
+/* Cast-Rank Mode */
+#if defined(SWIG_CASTRANK_MODE)
+#  ifndef SWIG_TypeRank
+#    define SWIG_TypeRank             unsigned long
+#  endif
+#  ifndef SWIG_MAXCASTRANK            /* Default cast allowed */
+#    define SWIG_MAXCASTRANK          (2)
+#  endif
+#  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
+#  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
+  return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
+}
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
+}
+#else /* no cast-rank mode */
+#  define SWIG_AddCast(r) (r)
+#  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
+#endif
+
+
+#include <string.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void *(*swig_converter_func)(void *, int *);
+typedef struct swig_type_info *(*swig_dycast_func)(void **);
+
+/* Structure to store information on one type */
+typedef struct swig_type_info {
+  const char             *name;			/* mangled name of this type */
+  const char             *str;			/* human readable name of this type */
+  swig_dycast_func        dcast;		/* dynamic cast function down a hierarchy */
+  struct swig_cast_info  *cast;			/* linked list of types that can cast into this type */
+  void                   *clientdata;		/* language specific type data */
+  int                    owndata;		/* flag if the structure owns the clientdata */
+} swig_type_info;
+
+/* Structure to store a type and conversion function used for casting */
+typedef struct swig_cast_info {
+  swig_type_info         *type;			/* pointer to type that is equivalent to this type */
+  swig_converter_func     converter;		/* function to cast the void pointers */
+  struct swig_cast_info  *next;			/* pointer to next cast in linked list */
+  struct swig_cast_info  *prev;			/* pointer to the previous cast */
+} swig_cast_info;
+
+/* Structure used to store module information
+ * Each module generates one structure like this, and the runtime collects
+ * all of these structures and stores them in a circularly linked list.*/
+typedef struct swig_module_info {
+  swig_type_info         **types;		/* Array of pointers to swig_type_info structures that are in this module */
+  size_t                 size;		        /* Number of types in this module */
+  struct swig_module_info *next;		/* Pointer to next element in circularly linked list */
+  swig_type_info         **type_initial;	/* Array of initially generated type structures */
+  swig_cast_info         **cast_initial;	/* Array of initially generated casting structures */
+  void                    *clientdata;		/* Language specific module data */
+} swig_module_info;
+
+/*
+  Compare two type names skipping the space characters, therefore
+  "char*" == "char *" and "Class<int>" == "Class<int >", etc.
+
+  Return 0 when the two name types are equivalent, as in
+  strncmp, but skipping ' '.
+*/
+SWIGRUNTIME int
+SWIG_TypeNameComp(const char *f1, const char *l1,
+		  const char *f2, const char *l2) {
+  for (;(f1 != l1) && (f2 != l2); ++f1, ++f2) {
+    while ((*f1 == ' ') && (f1 != l1)) ++f1;
+    while ((*f2 == ' ') && (f2 != l2)) ++f2;
+    if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1;
+  }
+  return (int)((l1 - f1) - (l2 - f2));
+}
+
+/*
+  Check type equivalence in a name list like <name1>|<name2>|...
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+*/
+SWIGRUNTIME int
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
+  const char* te = tb + strlen(tb);
+  const char* ne = nb;
+  while (equiv != 0 && *ne) {
+    for (nb = ne; *ne; ++ne) {
+      if (*ne == '|') break;
+    }
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
+    if (*ne) ++ne;
+  }
+  return equiv;
+}
+
+/*
+  Check type equivalence in a name list like <name1>|<name2>|...
+  Return 0 if not equal, 1 if equal
+*/
+SWIGRUNTIME int
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
+}
+
+/*
+  Check the typename
+*/
+SWIGRUNTIME swig_cast_info *
+SWIG_TypeCheck(const char *c, swig_type_info *ty) {
+  if (ty) {
+    swig_cast_info *iter = ty->cast;
+    while (iter) {
+      if (strcmp(iter->type->name, c) == 0) {
+        if (iter == ty->cast)
+          return iter;
+        /* Move iter to the top of the linked list */
+        iter->prev->next = iter->next;
+        if (iter->next)
+          iter->next->prev = iter->prev;
+        iter->next = ty->cast;
+        iter->prev = 0;
+        if (ty->cast) ty->cast->prev = iter;
+        ty->cast = iter;
+        return iter;
+      }
+      iter = iter->next;
+    }
+  }
+  return 0;
+}
+
+/*
+  Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
+*/
+SWIGRUNTIME swig_cast_info *
+SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *ty) {
+  if (ty) {
+    swig_cast_info *iter = ty->cast;
+    while (iter) {
+      if (iter->type == from) {
+        if (iter == ty->cast)
+          return iter;
+        /* Move iter to the top of the linked list */
+        iter->prev->next = iter->next;
+        if (iter->next)
+          iter->next->prev = iter->prev;
+        iter->next = ty->cast;
+        iter->prev = 0;
+        if (ty->cast) ty->cast->prev = iter;
+        ty->cast = iter;
+        return iter;
+      }
+      iter = iter->next;
+    }
+  }
+  return 0;
+}
+
+/*
+  Cast a pointer up an inheritance hierarchy
+*/
+SWIGRUNTIMEINLINE void *
+SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
+  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
+}
+
+/*
+   Dynamic pointer casting. Down an inheritance hierarchy
+*/
+SWIGRUNTIME swig_type_info *
+SWIG_TypeDynamicCast(swig_type_info *ty, void **ptr) {
+  swig_type_info *lastty = ty;
+  if (!ty || !ty->dcast) return ty;
+  while (ty && (ty->dcast)) {
+    ty = (*ty->dcast)(ptr);
+    if (ty) lastty = ty;
+  }
+  return lastty;
+}
+
+/*
+  Return the name associated with this type
+*/
+SWIGRUNTIMEINLINE const char *
+SWIG_TypeName(const swig_type_info *ty) {
+  return ty->name;
+}
+
+/*
+  Return the pretty name associated with this type,
+  that is an unmangled type name in a form presentable to the user.
+*/
+SWIGRUNTIME const char *
+SWIG_TypePrettyName(const swig_type_info *type) {
+  /* The "str" field contains the equivalent pretty names of the
+     type, separated by vertical-bar characters.  We choose
+     to print the last name, as it is often (?) the most
+     specific. */
+  if (!type) return NULL;
+  if (type->str != NULL) {
+    const char *last_name = type->str;
+    const char *s;
+    for (s = type->str; *s; s++)
+      if (*s == '|') last_name = s+1;
+    return last_name;
+  }
+  else
+    return type->name;
+}
+
+/*
+   Set the clientdata field for a type
+*/
+SWIGRUNTIME void
+SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
+  swig_cast_info *cast = ti->cast;
+  /* if (ti->clientdata == clientdata) return; */
+  ti->clientdata = clientdata;
+
+  while (cast) {
+    if (!cast->converter) {
+      swig_type_info *tc = cast->type;
+      if (!tc->clientdata) {
+	SWIG_TypeClientData(tc, clientdata);
+      }
+    }
+    cast = cast->next;
+  }
+}
+SWIGRUNTIME void
+SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
+  SWIG_TypeClientData(ti, clientdata);
+  ti->owndata = 1;
+}
+
+/*
+  Search for a swig_type_info structure only by mangled name
+  Search is a O(log #types)
+
+  We start searching at module start, and finish searching when start == end.
+  Note: if start == end at the beginning of the function, we go all the way around
+  the circular list.
+*/
+SWIGRUNTIME swig_type_info *
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
+		            const char *name) {
+  swig_module_info *iter = start;
+  do {
+    if (iter->size) {
+      size_t l = 0;
+      size_t r = iter->size - 1;
+      do {
+	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
+	size_t i = (l + r) >> 1;
+	const char *iname = iter->types[i]->name;
+	if (iname) {
+	  int compare = strcmp(name, iname);
+	  if (compare == 0) {
+	    return iter->types[i];
+	  } else if (compare < 0) {
+	    if (i) {
+	      r = i - 1;
+	    } else {
+	      break;
+	    }
+	  } else if (compare > 0) {
+	    l = i + 1;
+	  }
+	} else {
+	  break; /* should never happen */
+	}
+      } while (l <= r);
+    }
+    iter = iter->next;
+  } while (iter != end);
+  return 0;
+}
+
+/*
+  Search for a swig_type_info structure for either a mangled name or a human readable name.
+  It first searches the mangled names of the types, which is a O(log #types)
+  If a type is not found it then searches the human readable names, which is O(#types).
+
+  We start searching at module start, and finish searching when start == end.
+  Note: if start == end at the beginning of the function, we go all the way around
+  the circular list.
+*/
+SWIGRUNTIME swig_type_info *
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
+		     const char *name) {
+  /* STEP 1: Search the name field using binary search */
+  swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
+  if (ret) {
+    return ret;
+  } else {
+    /* STEP 2: If the type hasn't been found, do a complete search
+       of the str field (the human readable name) */
+    swig_module_info *iter = start;
+    do {
+      size_t i = 0;
+      for (; i < iter->size; ++i) {
+	if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name)))
+	  return iter->types[i];
+      }
+      iter = iter->next;
+    } while (iter != end);
+  }
+
+  /* neither found a match */
+  return 0;
+}
+
+/*
+   Pack binary data into a string
+*/
+SWIGRUNTIME char *
+SWIG_PackData(char *c, void *ptr, size_t sz) {
+  static const char hex[17] = "0123456789abcdef";
+  const unsigned char *u = (unsigned char *) ptr;
+  const unsigned char *eu =  u + sz;
+  for (; u != eu; ++u) {
+    unsigned char uu = *u;
+    *(c++) = hex[(uu & 0xf0) >> 4];
+    *(c++) = hex[uu & 0xf];
+  }
+  return c;
+}
+
+/*
+   Unpack binary data from a string
+*/
+SWIGRUNTIME const char *
+SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
+  unsigned char *u = (unsigned char *) ptr;
+  const unsigned char *eu = u + sz;
+  for (; u != eu; ++u) {
+    char d = *(c++);
+    unsigned char uu;
+    if ((d >= '0') && (d <= '9'))
+      uu = (unsigned char)((d - '0') << 4);
+    else if ((d >= 'a') && (d <= 'f'))
+      uu = (unsigned char)((d - ('a'-10)) << 4);
+    else
+      return (char *) 0;
+    d = *(c++);
+    if ((d >= '0') && (d <= '9'))
+      uu |= (unsigned char)(d - '0');
+    else if ((d >= 'a') && (d <= 'f'))
+      uu |= (unsigned char)(d - ('a'-10));
+    else
+      return (char *) 0;
+    *u = uu;
+  }
+  return c;
+}
+
+/*
+   Pack 'void *' into a string buffer.
+*/
+SWIGRUNTIME char *
+SWIG_PackVoidPtr(char *buff, void *ptr, const char *name, size_t bsz) {
+  char *r = buff;
+  if ((2*sizeof(void *) + 2) > bsz) return 0;
+  *(r++) = '_';
+  r = SWIG_PackData(r,&ptr,sizeof(void *));
+  if (strlen(name) + 1 > (bsz - (r - buff))) return 0;
+  strcpy(r,name);
+  return buff;
+}
+
+SWIGRUNTIME const char *
+SWIG_UnpackVoidPtr(const char *c, void **ptr, const char *name) {
+  if (*c != '_') {
+    if (strcmp(c,"NULL") == 0) {
+      *ptr = (void *) 0;
+      return name;
+    } else {
+      return 0;
+    }
+  }
+  return SWIG_UnpackData(++c,ptr,sizeof(void *));
+}
+
+SWIGRUNTIME char *
+SWIG_PackDataName(char *buff, void *ptr, size_t sz, const char *name, size_t bsz) {
+  char *r = buff;
+  size_t lname = (name ? strlen(name) : 0);
+  if ((2*sz + 2 + lname) > bsz) return 0;
+  *(r++) = '_';
+  r = SWIG_PackData(r,ptr,sz);
+  if (lname) {
+    strncpy(r,name,lname+1);
+  } else {
+    *r = 0;
+  }
+  return buff;
+}
+
+SWIGRUNTIME const char *
+SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
+  if (*c != '_') {
+    if (strcmp(c,"NULL") == 0) {
+      memset(ptr,0,sz);
+      return name;
+    } else {
+      return 0;
+    }
+  }
+  return SWIG_UnpackData(++c,ptr,sz);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+/*  Errors in SWIG */
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
+#define  SWIG_SystemError    	   -10
+#define  SWIG_AttributeError 	   -11
+#define  SWIG_MemoryError    	   -12
+#define  SWIG_NullReferenceError   -13
+
+
+
+/* Compatibility macros for Python 3 */
+#if PY_VERSION_HEX >= 0x03000000
+
+#define PyClass_Check(obj) PyObject_IsInstance(obj, (PyObject *)&PyType_Type)
+#define PyInt_Check(x) PyLong_Check(x)
+#define PyInt_AsLong(x) PyLong_AsLong(x)
+#define PyInt_FromLong(x) PyLong_FromLong(x)
+#define PyInt_FromSize_t(x) PyLong_FromSize_t(x)
+#define PyString_Check(name) PyBytes_Check(name)
+#define PyString_FromString(x) PyUnicode_FromString(x)
+#define PyString_Format(fmt, args)  PyUnicode_Format(fmt, args)
+#define PyString_AsString(str) PyBytes_AsString(str)
+#define PyString_Size(str) PyBytes_Size(str)	
+#define PyString_InternFromString(key) PyUnicode_InternFromString(key)
+#define Py_TPFLAGS_HAVE_CLASS Py_TPFLAGS_BASETYPE
+#define PyString_AS_STRING(x) PyUnicode_AS_STRING(x)
+#define _PyLong_FromSsize_t(x) PyLong_FromSsize_t(x)
+
+#endif
+
+#ifndef Py_TYPE
+#  define Py_TYPE(op) ((op)->ob_type)
+#endif
+
+/* SWIG APIs for compatibility of both Python 2 & 3 */
+
+#if PY_VERSION_HEX >= 0x03000000
+#  define SWIG_Python_str_FromFormat PyUnicode_FromFormat
+#else
+#  define SWIG_Python_str_FromFormat PyString_FromFormat
+#endif
+
+
+/* Warning: This function will allocate a new string in Python 3,
+ * so please call SWIG_Python_str_DelForPy3(x) to free the space.
+ */
+SWIGINTERN char*
+SWIG_Python_str_AsChar(PyObject *str)
+{
+#if PY_VERSION_HEX >= 0x03000000
+  char *cstr;
+  char *newstr;
+  Py_ssize_t len;
+  str = PyUnicode_AsUTF8String(str);
+  PyBytes_AsStringAndSize(str, &cstr, &len);
+  newstr = (char *) malloc(len+1);
+  memcpy(newstr, cstr, len+1);
+  Py_XDECREF(str);
+  return newstr;
+#else
+  return PyString_AsString(str);
+#endif
+}
+
+#if PY_VERSION_HEX >= 0x03000000
+#  define SWIG_Python_str_DelForPy3(x) free( (void*) (x) )
+#else
+#  define SWIG_Python_str_DelForPy3(x) 
+#endif
+
+
+SWIGINTERN PyObject*
+SWIG_Python_str_FromChar(const char *c)
+{
+#if PY_VERSION_HEX >= 0x03000000
+  return PyUnicode_FromString(c); 
+#else
+  return PyString_FromString(c);
+#endif
+}
+
+/* Add PyOS_snprintf for old Pythons */
+#if PY_VERSION_HEX < 0x02020000
+# if defined(_MSC_VER) || defined(__BORLANDC__) || defined(_WATCOM)
+#  define PyOS_snprintf _snprintf
+# else
+#  define PyOS_snprintf snprintf
+# endif
+#endif
+
+/* A crude PyString_FromFormat implementation for old Pythons */
+#if PY_VERSION_HEX < 0x02020000
+
+#ifndef SWIG_PYBUFFER_SIZE
+# define SWIG_PYBUFFER_SIZE 1024
+#endif
+
+static PyObject *
+PyString_FromFormat(const char *fmt, ...) {
+  va_list ap;
+  char buf[SWIG_PYBUFFER_SIZE * 2];
+  int res;
+  va_start(ap, fmt);
+  res = vsnprintf(buf, sizeof(buf), fmt, ap);
+  va_end(ap);
+  return (res < 0 || res >= (int)sizeof(buf)) ? 0 : PyString_FromString(buf);
+}
+#endif
+
+#ifndef PyObject_DEL
+# define PyObject_DEL PyObject_Del
+#endif
+
+/* A crude PyExc_StopIteration exception for old Pythons */
+#if PY_VERSION_HEX < 0x02020000
+# ifndef PyExc_StopIteration
+#  define PyExc_StopIteration PyExc_RuntimeError
+# endif
+# ifndef PyObject_GenericGetAttr
+#  define PyObject_GenericGetAttr 0
+# endif
+#endif
+
+/* Py_NotImplemented is defined in 2.1 and up. */
+#if PY_VERSION_HEX < 0x02010000
+# ifndef Py_NotImplemented
+#  define Py_NotImplemented PyExc_RuntimeError
+# endif
+#endif
+
+/* A crude PyString_AsStringAndSize implementation for old Pythons */
+#if PY_VERSION_HEX < 0x02010000
+# ifndef PyString_AsStringAndSize
+#  define PyString_AsStringAndSize(obj, s, len) {*s = PyString_AsString(obj); *len = *s ? strlen(*s) : 0;}
+# endif
+#endif
+
+/* PySequence_Size for old Pythons */
+#if PY_VERSION_HEX < 0x02000000
+# ifndef PySequence_Size
+#  define PySequence_Size PySequence_Length
+# endif
+#endif
+
+/* PyBool_FromLong for old Pythons */
+#if PY_VERSION_HEX < 0x02030000
+static
+PyObject *PyBool_FromLong(long ok)
+{
+  PyObject *result = ok ? Py_True : Py_False;
+  Py_INCREF(result);
+  return result;
+}
+#endif
+
+/* Py_ssize_t for old Pythons */
+/* This code is as recommended by: */
+/* http://www.python.org/dev/peps/pep-0353/#conversion-guidelines */
+#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
+typedef int Py_ssize_t;
+# define PY_SSIZE_T_MAX INT_MAX
+# define PY_SSIZE_T_MIN INT_MIN
+typedef inquiry lenfunc;
+typedef intargfunc ssizeargfunc;
+typedef intintargfunc ssizessizeargfunc;
+typedef intobjargproc ssizeobjargproc;
+typedef intintobjargproc ssizessizeobjargproc;
+typedef getreadbufferproc readbufferproc;
+typedef getwritebufferproc writebufferproc;
+typedef getsegcountproc segcountproc;
+typedef getcharbufferproc charbufferproc;
+static long PyNumber_AsSsize_t (PyObject *x, void *SWIGUNUSEDPARM(exc))
+{
+  long result = 0;
+  PyObject *i = PyNumber_Int(x);
+  if (i) {
+    result = PyInt_AsLong(i);
+    Py_DECREF(i);
+  }
+  return result;
+}
+#endif
+
+#if PY_VERSION_HEX < 0x02050000
+#define PyInt_FromSize_t(x) PyInt_FromLong((long)x)
+#endif
+
+#if PY_VERSION_HEX < 0x02040000
+#define Py_VISIT(op)				\
+  do { 						\
+    if (op) {					\
+      int vret = visit((op), arg);		\
+      if (vret)					\
+        return vret;				\
+    }						\
+  } while (0)
+#endif
+
+#if PY_VERSION_HEX < 0x02030000
+typedef struct {
+  PyTypeObject type;
+  PyNumberMethods as_number;
+  PyMappingMethods as_mapping;
+  PySequenceMethods as_sequence;
+  PyBufferProcs as_buffer;
+  PyObject *name, *slots;
+} PyHeapTypeObject;
+#endif
+
+#if PY_VERSION_HEX < 0x02030000
+typedef destructor freefunc;
+#endif
+
+#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION > 6) || \
+     (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION > 0) || \
+     (PY_MAJOR_VERSION > 3))
+# define SWIGPY_USE_CAPSULE
+# define SWIGPY_CAPSULE_NAME ((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION ".type_pointer_capsule" SWIG_TYPE_TABLE_NAME)
+#endif
+
+#if PY_VERSION_HEX < 0x03020000
+#define PyDescr_TYPE(x) (((PyDescrObject *)(x))->d_type)
+#define PyDescr_NAME(x) (((PyDescrObject *)(x))->d_name)
+#define Py_hash_t long
+#endif
+
+/* -----------------------------------------------------------------------------
+ * error manipulation
+ * ----------------------------------------------------------------------------- */
+
+SWIGRUNTIME PyObject*
+SWIG_Python_ErrorType(int code) {
+  PyObject* type = 0;
+  switch(code) {
+  case SWIG_MemoryError:
+    type = PyExc_MemoryError;
+    break;
+  case SWIG_IOError:
+    type = PyExc_IOError;
+    break;
+  case SWIG_RuntimeError:
+    type = PyExc_RuntimeError;
+    break;
+  case SWIG_IndexError:
+    type = PyExc_IndexError;
+    break;
+  case SWIG_TypeError:
+    type = PyExc_TypeError;
+    break;
+  case SWIG_DivisionByZero:
+    type = PyExc_ZeroDivisionError;
+    break;
+  case SWIG_OverflowError:
+    type = PyExc_OverflowError;
+    break;
+  case SWIG_SyntaxError:
+    type = PyExc_SyntaxError;
+    break;
+  case SWIG_ValueError:
+    type = PyExc_ValueError;
+    break;
+  case SWIG_SystemError:
+    type = PyExc_SystemError;
+    break;
+  case SWIG_AttributeError:
+    type = PyExc_AttributeError;
+    break;
+  default:
+    type = PyExc_RuntimeError;
+  }
+  return type;
+}
+
+
+SWIGRUNTIME void
+SWIG_Python_AddErrorMsg(const char* mesg)
+{
+  PyObject *type = 0;
+  PyObject *value = 0;
+  PyObject *traceback = 0;
+
+  if (PyErr_Occurred()) PyErr_Fetch(&type, &value, &traceback);
+  if (value) {
+    char *tmp;
+    PyObject *old_str = PyObject_Str(value);
+    PyErr_Clear();
+    Py_XINCREF(type);
+
+    PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg);
+    SWIG_Python_str_DelForPy3(tmp);
+    Py_DECREF(old_str);
+    Py_DECREF(value);
+  } else {
+    PyErr_SetString(PyExc_RuntimeError, mesg);
+  }
+}
+
+#if defined(SWIG_PYTHON_NO_THREADS)
+#  if defined(SWIG_PYTHON_THREADS)
+#    undef SWIG_PYTHON_THREADS
+#  endif
+#endif
+#if defined(SWIG_PYTHON_THREADS) /* Threading support is enabled */
+#  if !defined(SWIG_PYTHON_USE_GIL) && !defined(SWIG_PYTHON_NO_USE_GIL)
+#    if (PY_VERSION_HEX >= 0x02030000) /* For 2.3 or later, use the PyGILState calls */
+#      define SWIG_PYTHON_USE_GIL
+#    endif
+#  endif
+#  if defined(SWIG_PYTHON_USE_GIL) /* Use PyGILState threads calls */
+#    ifndef SWIG_PYTHON_INITIALIZE_THREADS
+#     define SWIG_PYTHON_INITIALIZE_THREADS  PyEval_InitThreads() 
+#    endif
+#    ifdef __cplusplus /* C++ code */
+       class SWIG_Python_Thread_Block {
+         bool status;
+         PyGILState_STATE state;
+       public:
+         void end() { if (status) { PyGILState_Release(state); status = false;} }
+         SWIG_Python_Thread_Block() : status(true), state(PyGILState_Ensure()) {}
+         ~SWIG_Python_Thread_Block() { end(); }
+       };
+       class SWIG_Python_Thread_Allow {
+         bool status;
+         PyThreadState *save;
+       public:
+         void end() { if (status) { PyEval_RestoreThread(save); status = false; }}
+         SWIG_Python_Thread_Allow() : status(true), save(PyEval_SaveThread()) {}
+         ~SWIG_Python_Thread_Allow() { end(); }
+       };
+#      define SWIG_PYTHON_THREAD_BEGIN_BLOCK   SWIG_Python_Thread_Block _swig_thread_block
+#      define SWIG_PYTHON_THREAD_END_BLOCK     _swig_thread_block.end()
+#      define SWIG_PYTHON_THREAD_BEGIN_ALLOW   SWIG_Python_Thread_Allow _swig_thread_allow
+#      define SWIG_PYTHON_THREAD_END_ALLOW     _swig_thread_allow.end()
+#    else /* C code */
+#      define SWIG_PYTHON_THREAD_BEGIN_BLOCK   PyGILState_STATE _swig_thread_block = PyGILState_Ensure()
+#      define SWIG_PYTHON_THREAD_END_BLOCK     PyGILState_Release(_swig_thread_block)
+#      define SWIG_PYTHON_THREAD_BEGIN_ALLOW   PyThreadState *_swig_thread_allow = PyEval_SaveThread()
+#      define SWIG_PYTHON_THREAD_END_ALLOW     PyEval_RestoreThread(_swig_thread_allow)
+#    endif
+#  else /* Old thread way, not implemented, user must provide it */
+#    if !defined(SWIG_PYTHON_INITIALIZE_THREADS)
+#      define SWIG_PYTHON_INITIALIZE_THREADS
+#    endif
+#    if !defined(SWIG_PYTHON_THREAD_BEGIN_BLOCK)
+#      define SWIG_PYTHON_THREAD_BEGIN_BLOCK
+#    endif
+#    if !defined(SWIG_PYTHON_THREAD_END_BLOCK)
+#      define SWIG_PYTHON_THREAD_END_BLOCK
+#    endif
+#    if !defined(SWIG_PYTHON_THREAD_BEGIN_ALLOW)
+#      define SWIG_PYTHON_THREAD_BEGIN_ALLOW
+#    endif
+#    if !defined(SWIG_PYTHON_THREAD_END_ALLOW)
+#      define SWIG_PYTHON_THREAD_END_ALLOW
+#    endif
+#  endif
+#else /* No thread support */
+#  define SWIG_PYTHON_INITIALIZE_THREADS
+#  define SWIG_PYTHON_THREAD_BEGIN_BLOCK
+#  define SWIG_PYTHON_THREAD_END_BLOCK
+#  define SWIG_PYTHON_THREAD_BEGIN_ALLOW
+#  define SWIG_PYTHON_THREAD_END_ALLOW
+#endif
+
+/* -----------------------------------------------------------------------------
+ * Python API portion that goes into the runtime
+ * ----------------------------------------------------------------------------- */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* -----------------------------------------------------------------------------
+ * Constant declarations
+ * ----------------------------------------------------------------------------- */
+
+/* Constant Types */
+#define SWIG_PY_POINTER 4
+#define SWIG_PY_BINARY  5
+
+/* Constant information structure */
+typedef struct swig_const_info {
+  int type;
+  char *name;
+  long lvalue;
+  double dvalue;
+  void   *pvalue;
+  swig_type_info **ptype;
+} swig_const_info;
+
+
+/* -----------------------------------------------------------------------------
+ * Wrapper of PyInstanceMethod_New() used in Python 3
+ * It is exported to the generated module, used for -fastproxy
+ * ----------------------------------------------------------------------------- */
+#if PY_VERSION_HEX >= 0x03000000
+SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func)
+{
+  return PyInstanceMethod_New(func);
+}
+#else
+SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *SWIGUNUSEDPARM(func))
+{
+  return NULL;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+
+/* -----------------------------------------------------------------------------
+ * pyrun.swg
+ *
+ * This file contains the runtime support for Python modules
+ * and includes code for managing global variables and pointer
+ * type checking.
+ *
+ * ----------------------------------------------------------------------------- */
+
+/* Common SWIG API */
+
+/* for raw pointers */
+#define SWIG_Python_ConvertPtr(obj, pptr, type, flags)  SWIG_Python_ConvertPtrAndOwn(obj, pptr, type, flags, 0)
+#define SWIG_ConvertPtr(obj, pptr, type, flags)         SWIG_Python_ConvertPtr(obj, pptr, type, flags)
+#define SWIG_ConvertPtrAndOwn(obj,pptr,type,flags,own)  SWIG_Python_ConvertPtrAndOwn(obj, pptr, type, flags, own)
+
+#ifdef SWIGPYTHON_BUILTIN
+#define SWIG_NewPointerObj(ptr, type, flags)            SWIG_Python_NewPointerObj(self, ptr, type, flags)
+#else
+#define SWIG_NewPointerObj(ptr, type, flags)            SWIG_Python_NewPointerObj(NULL, ptr, type, flags)
+#endif
+
+#define SWIG_InternalNewPointerObj(ptr, type, flags)	SWIG_Python_NewPointerObj(NULL, ptr, type, flags)
+
+#define SWIG_CheckImplicit(ty)                          SWIG_Python_CheckImplicit(ty) 
+#define SWIG_AcquirePtr(ptr, src)                       SWIG_Python_AcquirePtr(ptr, src)
+#define swig_owntype                                    int
+
+/* for raw packed data */
+#define SWIG_ConvertPacked(obj, ptr, sz, ty)            SWIG_Python_ConvertPacked(obj, ptr, sz, ty)
+#define SWIG_NewPackedObj(ptr, sz, type)                SWIG_Python_NewPackedObj(ptr, sz, type)
+
+/* for class or struct pointers */
+#define SWIG_ConvertInstance(obj, pptr, type, flags)    SWIG_ConvertPtr(obj, pptr, type, flags)
+#define SWIG_NewInstanceObj(ptr, type, flags)           SWIG_NewPointerObj(ptr, type, flags)
+
+/* for C or C++ function pointers */
+#define SWIG_ConvertFunctionPtr(obj, pptr, type)        SWIG_Python_ConvertFunctionPtr(obj, pptr, type)
+#define SWIG_NewFunctionPtrObj(ptr, type)               SWIG_Python_NewPointerObj(NULL, ptr, type, 0)
+
+/* for C++ member pointers, ie, member methods */
+#define SWIG_ConvertMember(obj, ptr, sz, ty)            SWIG_Python_ConvertPacked(obj, ptr, sz, ty)
+#define SWIG_NewMemberObj(ptr, sz, type)                SWIG_Python_NewPackedObj(ptr, sz, type)
+
+
+/* Runtime API */
+
+#define SWIG_GetModule(clientdata)                      SWIG_Python_GetModule(clientdata)
+#define SWIG_SetModule(clientdata, pointer)             SWIG_Python_SetModule(pointer)
+#define SWIG_NewClientData(obj)                         SwigPyClientData_New(obj)
+
+#define SWIG_SetErrorObj                                SWIG_Python_SetErrorObj                            
+#define SWIG_SetErrorMsg                        	SWIG_Python_SetErrorMsg				   
+#define SWIG_ErrorType(code)                    	SWIG_Python_ErrorType(code)                        
+#define SWIG_Error(code, msg)            		SWIG_Python_SetErrorMsg(SWIG_ErrorType(code), msg) 
+#define SWIG_fail                        		goto fail					   
+
+
+/* Runtime API implementation */
+
+/* Error manipulation */
+
+SWIGINTERN void 
+SWIG_Python_SetErrorObj(PyObject *errtype, PyObject *obj) {
+  SWIG_PYTHON_THREAD_BEGIN_BLOCK; 
+  PyErr_SetObject(errtype, obj);
+  Py_DECREF(obj);
+  SWIG_PYTHON_THREAD_END_BLOCK;
+}
+
+SWIGINTERN void 
+SWIG_Python_SetErrorMsg(PyObject *errtype, const char *msg) {
+  SWIG_PYTHON_THREAD_BEGIN_BLOCK;
+  PyErr_SetString(errtype, msg);
+  SWIG_PYTHON_THREAD_END_BLOCK;
+}
+
+#define SWIG_Python_Raise(obj, type, desc)  SWIG_Python_SetErrorObj(SWIG_Python_ExceptionType(desc), obj)
+
+/* Set a constant value */
+
+#if defined(SWIGPYTHON_BUILTIN)
+
+SWIGINTERN void
+SwigPyBuiltin_AddPublicSymbol(PyObject *seq, const char *key) {
+  PyObject *s = PyString_InternFromString(key);
+  PyList_Append(seq, s);
+  Py_DECREF(s);
+}
+
+SWIGINTERN void
+SWIG_Python_SetConstant(PyObject *d, PyObject *public_interface, const char *name, PyObject *obj) {   
+#if PY_VERSION_HEX < 0x02030000
+  PyDict_SetItemString(d, (char *)name, obj);
+#else
+  PyDict_SetItemString(d, name, obj);
+#endif
+  Py_DECREF(obj);
+  if (public_interface)
+    SwigPyBuiltin_AddPublicSymbol(public_interface, name);
+}
+
+#else
+
+SWIGINTERN void
+SWIG_Python_SetConstant(PyObject *d, const char *name, PyObject *obj) {   
+#if PY_VERSION_HEX < 0x02030000
+  PyDict_SetItemString(d, (char *)name, obj);
+#else
+  PyDict_SetItemString(d, name, obj);
+#endif
+  Py_DECREF(obj);                            
+}
+
+#endif
+
+/* Append a value to the result obj */
+
+SWIGINTERN PyObject*
+SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) {
+#if !defined(SWIG_PYTHON_OUTPUT_TUPLE)
+  if (!result) {
+    result = obj;
+  } else if (result == Py_None) {
+    Py_DECREF(result);
+    result = obj;
+  } else {
+    if (!PyList_Check(result)) {
+      PyObject *o2 = result;
+      result = PyList_New(1);
+      PyList_SetItem(result, 0, o2);
+    }
+    PyList_Append(result,obj);
+    Py_DECREF(obj);
+  }
+  return result;
+#else
+  PyObject*   o2;
+  PyObject*   o3;
+  if (!result) {
+    result = obj;
+  } else if (result == Py_None) {
+    Py_DECREF(result);
+    result = obj;
+  } else {
+    if (!PyTuple_Check(result)) {
+      o2 = result;
+      result = PyTuple_New(1);
+      PyTuple_SET_ITEM(result, 0, o2);
+    }
+    o3 = PyTuple_New(1);
+    PyTuple_SET_ITEM(o3, 0, obj);
+    o2 = result;
+    result = PySequence_Concat(o2, o3);
+    Py_DECREF(o2);
+    Py_DECREF(o3);
+  }
+  return result;
+#endif
+}
+
+/* Unpack the argument tuple */
+
+SWIGINTERN Py_ssize_t
+SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t max, PyObject **objs)
+{
+  if (!args) {
+    if (!min && !max) {
+      return 1;
+    } else {
+      PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got none", 
+		   name, (min == max ? "" : "at least "), (int)min);
+      return 0;
+    }
+  }  
+  if (!PyTuple_Check(args)) {
+    if (min <= 1 && max >= 1) {
+      Py_ssize_t i;
+      objs[0] = args;
+      for (i = 1; i < max; ++i) {
+	objs[i] = 0;
+      }
+      return 2;
+    }
+    PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple");
+    return 0;
+  } else {
+    Py_ssize_t l = PyTuple_GET_SIZE(args);
+    if (l < min) {
+      PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
+		   name, (min == max ? "" : "at least "), (int)min, (int)l);
+      return 0;
+    } else if (l > max) {
+      PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
+		   name, (min == max ? "" : "at most "), (int)max, (int)l);
+      return 0;
+    } else {
+      Py_ssize_t i;
+      for (i = 0; i < l; ++i) {
+	objs[i] = PyTuple_GET_ITEM(args, i);
+      }
+      for (; l < max; ++l) {
+	objs[l] = 0;
+      }
+      return i + 1;
+    }    
+  }
+}
+
+/* A functor is a function object with one single object argument */
+#if PY_VERSION_HEX >= 0x02020000
+#define SWIG_Python_CallFunctor(functor, obj)	        PyObject_CallFunctionObjArgs(functor, obj, NULL);
+#else
+#define SWIG_Python_CallFunctor(functor, obj)	        PyObject_CallFunction(functor, "O", obj);
+#endif
+
+/*
+  Helper for static pointer initialization for both C and C++ code, for example
+  static PyObject *SWIG_STATIC_POINTER(MyVar) = NewSomething(...);
+*/
+#ifdef __cplusplus
+#define SWIG_STATIC_POINTER(var)  var
+#else
+#define SWIG_STATIC_POINTER(var)  var = 0; if (!var) var
+#endif
+
+/* -----------------------------------------------------------------------------
+ * Pointer declarations
+ * ----------------------------------------------------------------------------- */
+
+/* Flags for new pointer objects */
+#define SWIG_POINTER_NOSHADOW       (SWIG_POINTER_OWN      << 1)
+#define SWIG_POINTER_NEW            (SWIG_POINTER_NOSHADOW | SWIG_POINTER_OWN)
+
+#define SWIG_POINTER_IMPLICIT_CONV  (SWIG_POINTER_DISOWN   << 1)
+
+#define SWIG_BUILTIN_TP_INIT	    (SWIG_POINTER_OWN << 2)
+#define SWIG_BUILTIN_INIT	    (SWIG_BUILTIN_TP_INIT | SWIG_POINTER_OWN)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*  How to access Py_None */
+#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#  ifndef SWIG_PYTHON_NO_BUILD_NONE
+#    ifndef SWIG_PYTHON_BUILD_NONE
+#      define SWIG_PYTHON_BUILD_NONE
+#    endif
+#  endif
+#endif
+
+#ifdef SWIG_PYTHON_BUILD_NONE
+#  ifdef Py_None
+#   undef Py_None
+#   define Py_None SWIG_Py_None()
+#  endif
+SWIGRUNTIMEINLINE PyObject * 
+_SWIG_Py_None(void)
+{
+  PyObject *none = Py_BuildValue((char*)"");
+  Py_DECREF(none);
+  return none;
+}
+SWIGRUNTIME PyObject * 
+SWIG_Py_None(void)
+{
+  static PyObject *SWIG_STATIC_POINTER(none) = _SWIG_Py_None();
+  return none;
+}
+#endif
+
+/* The python void return value */
+
+SWIGRUNTIMEINLINE PyObject * 
+SWIG_Py_Void(void)
+{
+  PyObject *none = Py_None;
+  Py_INCREF(none);
+  return none;
+}
+
+/* SwigPyClientData */
+
+typedef struct {
+  PyObject *klass;
+  PyObject *newraw;
+  PyObject *newargs;
+  PyObject *destroy;
+  int delargs;
+  int implicitconv;
+  PyTypeObject *pytype;
+} SwigPyClientData;
+
+SWIGRUNTIMEINLINE int 
+SWIG_Python_CheckImplicit(swig_type_info *ty)
+{
+  SwigPyClientData *data = (SwigPyClientData *)ty->clientdata;
+  return data ? data->implicitconv : 0;
+}
+
+SWIGRUNTIMEINLINE PyObject *
+SWIG_Python_ExceptionType(swig_type_info *desc) {
+  SwigPyClientData *data = desc ? (SwigPyClientData *) desc->clientdata : 0;
+  PyObject *klass = data ? data->klass : 0;
+  return (klass ? klass : PyExc_RuntimeError);
+}
+
+
+SWIGRUNTIME SwigPyClientData * 
+SwigPyClientData_New(PyObject* obj)
+{
+  if (!obj) {
+    return 0;
+  } else {
+    SwigPyClientData *data = (SwigPyClientData *)malloc(sizeof(SwigPyClientData));
+    /* the klass element */
+    data->klass = obj;
+    Py_INCREF(data->klass);
+    /* the newraw method and newargs arguments used to create a new raw instance */
+    if (PyClass_Check(obj)) {
+      data->newraw = 0;
+      data->newargs = obj;
+      Py_INCREF(obj);
+    } else {
+#if (PY_VERSION_HEX < 0x02020000)
+      data->newraw = 0;
+#else
+      data->newraw = PyObject_GetAttrString(data->klass, (char *)"__new__");
+#endif
+      if (data->newraw) {
+	Py_INCREF(data->newraw);
+	data->newargs = PyTuple_New(1);
+	PyTuple_SetItem(data->newargs, 0, obj);
+      } else {
+	data->newargs = obj;
+      }
+      Py_INCREF(data->newargs);
+    }
+    /* the destroy method, aka as the C++ delete method */
+    data->destroy = PyObject_GetAttrString(data->klass, (char *)"__swig_destroy__");
+    if (PyErr_Occurred()) {
+      PyErr_Clear();
+      data->destroy = 0;
+    }
+    if (data->destroy) {
+      int flags;
+      Py_INCREF(data->destroy);
+      flags = PyCFunction_GET_FLAGS(data->destroy);
+#ifdef METH_O
+      data->delargs = !(flags & (METH_O));
+#else
+      data->delargs = 0;
+#endif
+    } else {
+      data->delargs = 0;
+    }
+    data->implicitconv = 0;
+    data->pytype = 0;
+    return data;
+  }
+}
+
+SWIGRUNTIME void 
+SwigPyClientData_Del(SwigPyClientData *data) {
+  Py_XDECREF(data->newraw);
+  Py_XDECREF(data->newargs);
+  Py_XDECREF(data->destroy);
+}
+
+/* =============== SwigPyObject =====================*/
+
+typedef struct {
+  PyObject_HEAD
+  void *ptr;
+  swig_type_info *ty;
+  int own;
+  PyObject *next;
+#ifdef SWIGPYTHON_BUILTIN
+  PyObject *dict;
+#endif
+} SwigPyObject;
+
+
+#ifdef SWIGPYTHON_BUILTIN
+
+SWIGRUNTIME PyObject *
+SwigPyObject_get___dict__(PyObject *v, PyObject *SWIGUNUSEDPARM(args))
+{
+  SwigPyObject *sobj = (SwigPyObject *)v;
+
+  if (!sobj->dict)
+    sobj->dict = PyDict_New();
+
+  Py_INCREF(sobj->dict);
+  return sobj->dict;
+}
+
+#endif
+
+SWIGRUNTIME PyObject *
+SwigPyObject_long(SwigPyObject *v)
+{
+  return PyLong_FromVoidPtr(v->ptr);
+}
+
+SWIGRUNTIME PyObject *
+SwigPyObject_format(const char* fmt, SwigPyObject *v)
+{
+  PyObject *res = NULL;
+  PyObject *args = PyTuple_New(1);
+  if (args) {
+    if (PyTuple_SetItem(args, 0, SwigPyObject_long(v)) == 0) {
+      PyObject *ofmt = SWIG_Python_str_FromChar(fmt);
+      if (ofmt) {
+#if PY_VERSION_HEX >= 0x03000000
+	res = PyUnicode_Format(ofmt,args);
+#else
+	res = PyString_Format(ofmt,args);
+#endif
+	Py_DECREF(ofmt);
+      }
+      Py_DECREF(args);
+    }
+  }
+  return res;
+}
+
+SWIGRUNTIME PyObject *
+SwigPyObject_oct(SwigPyObject *v)
+{
+  return SwigPyObject_format("%o",v);
+}
+
+SWIGRUNTIME PyObject *
+SwigPyObject_hex(SwigPyObject *v)
+{
+  return SwigPyObject_format("%x",v);
+}
+
+SWIGRUNTIME PyObject *
+#ifdef METH_NOARGS
+SwigPyObject_repr(SwigPyObject *v)
+#else
+SwigPyObject_repr(SwigPyObject *v, PyObject *args)
+#endif
+{
+  const char *name = SWIG_TypePrettyName(v->ty);
+  PyObject *repr = SWIG_Python_str_FromFormat("<Swig Object of type '%s' at %p>", (name ? name : "unknown"), (void *)v);
+  if (v->next) {
+# ifdef METH_NOARGS
+    PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next);
+# else
+    PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next, args);
+# endif
+# if PY_VERSION_HEX >= 0x03000000
+    PyObject *joined = PyUnicode_Concat(repr, nrep);
+    Py_DecRef(repr);
+    Py_DecRef(nrep);
+    repr = joined;
+# else
+    PyString_ConcatAndDel(&repr,nrep);
+# endif
+  }
+  return repr;  
+}
+
+SWIGRUNTIME int
+SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w)
+{
+  void *i = v->ptr;
+  void *j = w->ptr;
+  return (i < j) ? -1 : ((i > j) ? 1 : 0);
+}
+
+/* Added for Python 3.x, would it also be useful for Python 2.x? */
+SWIGRUNTIME PyObject*
+SwigPyObject_richcompare(SwigPyObject *v, SwigPyObject *w, int op)
+{
+  PyObject* res;
+  if( op != Py_EQ && op != Py_NE ) {
+    Py_INCREF(Py_NotImplemented);
+    return Py_NotImplemented;
+  }
+  res = PyBool_FromLong( (SwigPyObject_compare(v, w)==0) == (op == Py_EQ) ? 1 : 0);
+  return res;  
+}
+
+
+SWIGRUNTIME PyTypeObject* SwigPyObject_TypeOnce(void);
+
+#ifdef SWIGPYTHON_BUILTIN
+static swig_type_info *SwigPyObject_stype = 0;
+SWIGRUNTIME PyTypeObject*
+SwigPyObject_type(void) {
+    SwigPyClientData *cd;
+    assert(SwigPyObject_stype);
+    cd = (SwigPyClientData*) SwigPyObject_stype->clientdata;
+    assert(cd);
+    assert(cd->pytype);
+    return cd->pytype;
+}
+#else
+SWIGRUNTIME PyTypeObject*
+SwigPyObject_type(void) {
+  static PyTypeObject *SWIG_STATIC_POINTER(type) = SwigPyObject_TypeOnce();
+  return type;
+}
+#endif
+
+SWIGRUNTIMEINLINE int
+SwigPyObject_Check(PyObject *op) {
+#ifdef SWIGPYTHON_BUILTIN
+  PyTypeObject *target_tp = SwigPyObject_type();
+  if (PyType_IsSubtype(op->ob_type, target_tp))
+    return 1;
+  return (strcmp(op->ob_type->tp_name, "SwigPyObject") == 0);
+#else
+  return (Py_TYPE(op) == SwigPyObject_type())
+    || (strcmp(Py_TYPE(op)->tp_name,"SwigPyObject") == 0);
+#endif
+}
+
+SWIGRUNTIME PyObject *
+SwigPyObject_New(void *ptr, swig_type_info *ty, int own);
+
+SWIGRUNTIME void
+SwigPyObject_dealloc(PyObject *v)
+{
+  SwigPyObject *sobj = (SwigPyObject *) v;
+  PyObject *next = sobj->next;
+  if (sobj->own == SWIG_POINTER_OWN) {
+    swig_type_info *ty = sobj->ty;
+    SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
+    PyObject *destroy = data ? data->destroy : 0;
+    if (destroy) {
+      /* destroy is always a VARARGS method */
+      PyObject *res;
+
+      /* PyObject_CallFunction() has the potential to silently drop
+         the active active exception.  In cases of unnamed temporary
+         variable or where we just finished iterating over a generator
+         StopIteration will be active right now, and this needs to
+         remain true upon return from SwigPyObject_dealloc.  So save
+         and restore. */
+      
+      PyObject *val = NULL, *type = NULL, *tb = NULL;
+      PyErr_Fetch(&val, &type, &tb);
+
+      if (data->delargs) {
+        /* we need to create a temporary object to carry the destroy operation */
+        PyObject *tmp = SwigPyObject_New(sobj->ptr, ty, 0);
+        res = SWIG_Python_CallFunctor(destroy, tmp);
+        Py_DECREF(tmp);
+      } else {
+        PyCFunction meth = PyCFunction_GET_FUNCTION(destroy);
+        PyObject *mself = PyCFunction_GET_SELF(destroy);
+        res = ((*meth)(mself, v));
+      }
+      if (!res)
+        PyErr_WriteUnraisable(destroy);
+
+      PyErr_Restore(val, type, tb);
+
+      Py_XDECREF(res);
+    } 
+#if !defined(SWIG_PYTHON_SILENT_MEMLEAK)
+    else {
+      const char *name = SWIG_TypePrettyName(ty);
+      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", (name ? name : "unknown"));
+    }
+#endif
+  } 
+  Py_XDECREF(next);
+  PyObject_DEL(v);
+}
+
+SWIGRUNTIME PyObject* 
+SwigPyObject_append(PyObject* v, PyObject* next)
+{
+  SwigPyObject *sobj = (SwigPyObject *) v;
+#ifndef METH_O
+  PyObject *tmp = 0;
+  if (!PyArg_ParseTuple(next,(char *)"O:append", &tmp)) return NULL;
+  next = tmp;
+#endif
+  if (!SwigPyObject_Check(next)) {
+    PyErr_SetString(PyExc_TypeError, "Attempt to append a non SwigPyObject");
+    return NULL;
+  }
+  sobj->next = next;
+  Py_INCREF(next);
+  return SWIG_Py_Void();
+}
+
+SWIGRUNTIME PyObject* 
+#ifdef METH_NOARGS
+SwigPyObject_next(PyObject* v)
+#else
+SwigPyObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
+#endif
+{
+  SwigPyObject *sobj = (SwigPyObject *) v;
+  if (sobj->next) {    
+    Py_INCREF(sobj->next);
+    return sobj->next;
+  } else {
+    return SWIG_Py_Void();
+  }
+}
+
+SWIGINTERN PyObject*
+#ifdef METH_NOARGS
+SwigPyObject_disown(PyObject *v)
+#else
+SwigPyObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
+#endif
+{
+  SwigPyObject *sobj = (SwigPyObject *)v;
+  sobj->own = 0;
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject*
+#ifdef METH_NOARGS
+SwigPyObject_acquire(PyObject *v)
+#else
+SwigPyObject_acquire(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
+#endif
+{
+  SwigPyObject *sobj = (SwigPyObject *)v;
+  sobj->own = SWIG_POINTER_OWN;
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject*
+SwigPyObject_own(PyObject *v, PyObject *args)
+{
+  PyObject *val = 0;
+#if (PY_VERSION_HEX < 0x02020000)
+  if (!PyArg_ParseTuple(args,(char *)"|O:own",&val))
+#elif (PY_VERSION_HEX < 0x02050000)
+  if (!PyArg_UnpackTuple(args, (char *)"own", 0, 1, &val)) 
+#else
+  if (!PyArg_UnpackTuple(args, "own", 0, 1, &val)) 
+#endif
+    {
+      return NULL;
+    } 
+  else
+    {
+      SwigPyObject *sobj = (SwigPyObject *)v;
+      PyObject *obj = PyBool_FromLong(sobj->own);
+      if (val) {
+#ifdef METH_NOARGS
+	if (PyObject_IsTrue(val)) {
+	  SwigPyObject_acquire(v);
+	} else {
+	  SwigPyObject_disown(v);
+	}
+#else
+	if (PyObject_IsTrue(val)) {
+	  SwigPyObject_acquire(v,args);
+	} else {
+	  SwigPyObject_disown(v,args);
+	}
+#endif
+      } 
+      return obj;
+    }
+}
+
+#ifdef METH_O
+static PyMethodDef
+swigobject_methods[] = {
+  {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"acquires ownership of the pointer"},
+  {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
+  {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_O,       (char *)"appends another 'this' object"},
+  {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
+  {(char *)"__repr__",(PyCFunction)SwigPyObject_repr,    METH_NOARGS,  (char *)"returns object representation"},
+  {0, 0, 0, 0}  
+};
+#else
+static PyMethodDef
+swigobject_methods[] = {
+  {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_VARARGS,  (char *)"releases ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_VARARGS,  (char *)"acquires ownership of the pointer"},
+  {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS,  (char *)"returns/sets ownership of the pointer"},
+  {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_VARARGS,  (char *)"appends another 'this' object"},
+  {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_VARARGS,  (char *)"returns the next 'this' object"},
+  {(char *)"__repr__",(PyCFunction)SwigPyObject_repr,   METH_VARARGS,  (char *)"returns object representation"},
+  {0, 0, 0, 0}  
+};
+#endif
+
+#if PY_VERSION_HEX < 0x02020000
+SWIGINTERN PyObject *
+SwigPyObject_getattr(SwigPyObject *sobj,char *name)
+{
+  return Py_FindMethod(swigobject_methods, (PyObject *)sobj, name);
+}
+#endif
+
+SWIGRUNTIME PyTypeObject*
+SwigPyObject_TypeOnce(void) {
+  static char swigobject_doc[] = "Swig object carries a C/C++ instance pointer";
+
+  static PyNumberMethods SwigPyObject_as_number = {
+    (binaryfunc)0, /*nb_add*/
+    (binaryfunc)0, /*nb_subtract*/
+    (binaryfunc)0, /*nb_multiply*/
+    /* nb_divide removed in Python 3 */
+#if PY_VERSION_HEX < 0x03000000
+    (binaryfunc)0, /*nb_divide*/
+#endif
+    (binaryfunc)0, /*nb_remainder*/
+    (binaryfunc)0, /*nb_divmod*/
+    (ternaryfunc)0,/*nb_power*/
+    (unaryfunc)0,  /*nb_negative*/
+    (unaryfunc)0,  /*nb_positive*/
+    (unaryfunc)0,  /*nb_absolute*/
+    (inquiry)0,    /*nb_nonzero*/
+    0,		   /*nb_invert*/
+    0,		   /*nb_lshift*/
+    0,		   /*nb_rshift*/
+    0,		   /*nb_and*/
+    0,		   /*nb_xor*/
+    0,		   /*nb_or*/
+#if PY_VERSION_HEX < 0x03000000
+    0,   /*nb_coerce*/
+#endif
+    (unaryfunc)SwigPyObject_long, /*nb_int*/
+#if PY_VERSION_HEX < 0x03000000
+    (unaryfunc)SwigPyObject_long, /*nb_long*/
+#else
+    0, /*nb_reserved*/
+#endif
+    (unaryfunc)0,                 /*nb_float*/
+#if PY_VERSION_HEX < 0x03000000
+    (unaryfunc)SwigPyObject_oct,  /*nb_oct*/
+    (unaryfunc)SwigPyObject_hex,  /*nb_hex*/
+#endif
+#if PY_VERSION_HEX >= 0x03050000 /* 3.5 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_matrix_multiply */
+#elif PY_VERSION_HEX >= 0x03000000 /* 3.0 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index, nb_inplace_divide removed */
+#elif PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */
+#elif PY_VERSION_HEX >= 0x02020000 /* 2.2.0 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */
+#elif PY_VERSION_HEX >= 0x02000000 /* 2.0.0 */
+    0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */
+#endif
+  };
+
+  static PyTypeObject swigpyobject_type;
+  static int type_init = 0;
+  if (!type_init) {
+    const PyTypeObject tmp = {
+#if PY_VERSION_HEX >= 0x03000000
+      PyVarObject_HEAD_INIT(NULL, 0)
+#else
+      PyObject_HEAD_INIT(NULL)
+      0,                                    /* ob_size */
+#endif
+      (char *)"SwigPyObject",               /* tp_name */
+      sizeof(SwigPyObject),                 /* tp_basicsize */
+      0,                                    /* tp_itemsize */
+      (destructor)SwigPyObject_dealloc,     /* tp_dealloc */
+      0,                                    /* tp_print */
+#if PY_VERSION_HEX < 0x02020000
+      (getattrfunc)SwigPyObject_getattr,    /* tp_getattr */
+#else
+      (getattrfunc)0,                       /* tp_getattr */
+#endif
+      (setattrfunc)0,                       /* tp_setattr */
+#if PY_VERSION_HEX >= 0x03000000
+      0, /* tp_reserved in 3.0.1, tp_compare in 3.0.0 but not used */
+#else
+      (cmpfunc)SwigPyObject_compare,        /* tp_compare */
+#endif
+      (reprfunc)SwigPyObject_repr,          /* tp_repr */
+      &SwigPyObject_as_number,              /* tp_as_number */
+      0,                                    /* tp_as_sequence */
+      0,                                    /* tp_as_mapping */
+      (hashfunc)0,                          /* tp_hash */
+      (ternaryfunc)0,                       /* tp_call */
+      0,                                    /* tp_str */
+      PyObject_GenericGetAttr,              /* tp_getattro */
+      0,                                    /* tp_setattro */
+      0,                                    /* tp_as_buffer */
+      Py_TPFLAGS_DEFAULT,                   /* tp_flags */
+      swigobject_doc,                       /* tp_doc */
+      0,                                    /* tp_traverse */
+      0,                                    /* tp_clear */
+      (richcmpfunc)SwigPyObject_richcompare,/* tp_richcompare */
+      0,                                    /* tp_weaklistoffset */
+#if PY_VERSION_HEX >= 0x02020000
+      0,                                    /* tp_iter */
+      0,                                    /* tp_iternext */
+      swigobject_methods,                   /* tp_methods */
+      0,                                    /* tp_members */
+      0,                                    /* tp_getset */
+      0,                                    /* tp_base */
+      0,                                    /* tp_dict */
+      0,                                    /* tp_descr_get */
+      0,                                    /* tp_descr_set */
+      0,                                    /* tp_dictoffset */
+      0,                                    /* tp_init */
+      0,                                    /* tp_alloc */
+      0,                                    /* tp_new */
+      0,                                    /* tp_free */
+      0,                                    /* tp_is_gc */
+      0,                                    /* tp_bases */
+      0,                                    /* tp_mro */
+      0,                                    /* tp_cache */
+      0,                                    /* tp_subclasses */
+      0,                                    /* tp_weaklist */
+#endif
+#if PY_VERSION_HEX >= 0x02030000
+      0,                                    /* tp_del */
+#endif
+#if PY_VERSION_HEX >= 0x02060000
+      0,                                    /* tp_version_tag */
+#endif
+#if PY_VERSION_HEX >= 0x03040000
+      0,                                    /* tp_finalize */
+#endif
+#ifdef COUNT_ALLOCS
+      0,                                    /* tp_allocs */
+      0,                                    /* tp_frees */
+      0,                                    /* tp_maxalloc */
+#if PY_VERSION_HEX >= 0x02050000
+      0,                                    /* tp_prev */
+#endif
+      0                                     /* tp_next */
+#endif
+    };
+    swigpyobject_type = tmp;
+    type_init = 1;
+#if PY_VERSION_HEX < 0x02020000
+    swigpyobject_type.ob_type = &PyType_Type;
+#else
+    if (PyType_Ready(&swigpyobject_type) < 0)
+      return NULL;
+#endif
+  }
+  return &swigpyobject_type;
+}
+
+SWIGRUNTIME PyObject *
+SwigPyObject_New(void *ptr, swig_type_info *ty, int own)
+{
+  SwigPyObject *sobj = PyObject_NEW(SwigPyObject, SwigPyObject_type());
+  if (sobj) {
+    sobj->ptr  = ptr;
+    sobj->ty   = ty;
+    sobj->own  = own;
+    sobj->next = 0;
+  }
+  return (PyObject *)sobj;
+}
+
+/* -----------------------------------------------------------------------------
+ * Implements a simple Swig Packed type, and use it instead of string
+ * ----------------------------------------------------------------------------- */
+
+typedef struct {
+  PyObject_HEAD
+  void *pack;
+  swig_type_info *ty;
+  size_t size;
+} SwigPyPacked;
+
+SWIGRUNTIME int
+SwigPyPacked_print(SwigPyPacked *v, FILE *fp, int SWIGUNUSEDPARM(flags))
+{
+  char result[SWIG_BUFFER_SIZE];
+  fputs("<Swig Packed ", fp); 
+  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) {
+    fputs("at ", fp); 
+    fputs(result, fp); 
+  }
+  fputs(v->ty->name,fp); 
+  fputs(">", fp);
+  return 0; 
+}
+  
+SWIGRUNTIME PyObject *
+SwigPyPacked_repr(SwigPyPacked *v)
+{
+  char result[SWIG_BUFFER_SIZE];
+  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) {
+    return SWIG_Python_str_FromFormat("<Swig Packed at %s%s>", result, v->ty->name);
+  } else {
+    return SWIG_Python_str_FromFormat("<Swig Packed %s>", v->ty->name);
+  }  
+}
+
+SWIGRUNTIME PyObject *
+SwigPyPacked_str(SwigPyPacked *v)
+{
+  char result[SWIG_BUFFER_SIZE];
+  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))){
+    return SWIG_Python_str_FromFormat("%s%s", result, v->ty->name);
+  } else {
+    return SWIG_Python_str_FromChar(v->ty->name);
+  }  
+}
+
+SWIGRUNTIME int
+SwigPyPacked_compare(SwigPyPacked *v, SwigPyPacked *w)
+{
+  size_t i = v->size;
+  size_t j = w->size;
+  int s = (i < j) ? -1 : ((i > j) ? 1 : 0);
+  return s ? s : strncmp((char *)v->pack, (char *)w->pack, 2*v->size);
+}
+
+SWIGRUNTIME PyTypeObject* SwigPyPacked_TypeOnce(void);
+
+SWIGRUNTIME PyTypeObject*
+SwigPyPacked_type(void) {
+  static PyTypeObject *SWIG_STATIC_POINTER(type) = SwigPyPacked_TypeOnce();
+  return type;
+}
+
+SWIGRUNTIMEINLINE int
+SwigPyPacked_Check(PyObject *op) {
+  return ((op)->ob_type == SwigPyPacked_TypeOnce()) 
+    || (strcmp((op)->ob_type->tp_name,"SwigPyPacked") == 0);
+}
+
+SWIGRUNTIME void
+SwigPyPacked_dealloc(PyObject *v)
+{
+  if (SwigPyPacked_Check(v)) {
+    SwigPyPacked *sobj = (SwigPyPacked *) v;
+    free(sobj->pack);
+  }
+  PyObject_DEL(v);
+}
+
+SWIGRUNTIME PyTypeObject*
+SwigPyPacked_TypeOnce(void) {
+  static char swigpacked_doc[] = "Swig object carries a C/C++ instance pointer";
+  static PyTypeObject swigpypacked_type;
+  static int type_init = 0;
+  if (!type_init) {
+    const PyTypeObject tmp = {
+#if PY_VERSION_HEX>=0x03000000
+      PyVarObject_HEAD_INIT(NULL, 0)
+#else
+      PyObject_HEAD_INIT(NULL)
+      0,                                    /* ob_size */
+#endif
+      (char *)"SwigPyPacked",               /* tp_name */
+      sizeof(SwigPyPacked),                 /* tp_basicsize */
+      0,                                    /* tp_itemsize */
+      (destructor)SwigPyPacked_dealloc,     /* tp_dealloc */
+      (printfunc)SwigPyPacked_print,        /* tp_print */
+      (getattrfunc)0,                       /* tp_getattr */
+      (setattrfunc)0,                       /* tp_setattr */
+#if PY_VERSION_HEX>=0x03000000
+      0, /* tp_reserved in 3.0.1 */
+#else
+      (cmpfunc)SwigPyPacked_compare,        /* tp_compare */
+#endif
+      (reprfunc)SwigPyPacked_repr,          /* tp_repr */
+      0,                                    /* tp_as_number */
+      0,                                    /* tp_as_sequence */
+      0,                                    /* tp_as_mapping */
+      (hashfunc)0,                          /* tp_hash */
+      (ternaryfunc)0,                       /* tp_call */
+      (reprfunc)SwigPyPacked_str,           /* tp_str */
+      PyObject_GenericGetAttr,              /* tp_getattro */
+      0,                                    /* tp_setattro */
+      0,                                    /* tp_as_buffer */
+      Py_TPFLAGS_DEFAULT,                   /* tp_flags */
+      swigpacked_doc,                       /* tp_doc */
+      0,                                    /* tp_traverse */
+      0,                                    /* tp_clear */
+      0,                                    /* tp_richcompare */
+      0,                                    /* tp_weaklistoffset */
+#if PY_VERSION_HEX >= 0x02020000
+      0,                                    /* tp_iter */
+      0,                                    /* tp_iternext */
+      0,                                    /* tp_methods */
+      0,                                    /* tp_members */
+      0,                                    /* tp_getset */
+      0,                                    /* tp_base */
+      0,                                    /* tp_dict */
+      0,                                    /* tp_descr_get */
+      0,                                    /* tp_descr_set */
+      0,                                    /* tp_dictoffset */
+      0,                                    /* tp_init */
+      0,                                    /* tp_alloc */
+      0,                                    /* tp_new */
+      0,                                    /* tp_free */
+      0,                                    /* tp_is_gc */
+      0,                                    /* tp_bases */
+      0,                                    /* tp_mro */
+      0,                                    /* tp_cache */
+      0,                                    /* tp_subclasses */
+      0,                                    /* tp_weaklist */
+#endif
+#if PY_VERSION_HEX >= 0x02030000
+      0,                                    /* tp_del */
+#endif
+#if PY_VERSION_HEX >= 0x02060000
+      0,                                    /* tp_version_tag */
+#endif
+#if PY_VERSION_HEX >= 0x03040000
+      0,                                    /* tp_finalize */
+#endif
+#ifdef COUNT_ALLOCS
+      0,                                    /* tp_allocs */
+      0,                                    /* tp_frees */
+      0,                                    /* tp_maxalloc */
+#if PY_VERSION_HEX >= 0x02050000
+      0,                                    /* tp_prev */
+#endif
+      0                                     /* tp_next */
+#endif
+    };
+    swigpypacked_type = tmp;
+    type_init = 1;
+#if PY_VERSION_HEX < 0x02020000
+    swigpypacked_type.ob_type = &PyType_Type;
+#else
+    if (PyType_Ready(&swigpypacked_type) < 0)
+      return NULL;
+#endif
+  }
+  return &swigpypacked_type;
+}
+
+SWIGRUNTIME PyObject *
+SwigPyPacked_New(void *ptr, size_t size, swig_type_info *ty)
+{
+  SwigPyPacked *sobj = PyObject_NEW(SwigPyPacked, SwigPyPacked_type());
+  if (sobj) {
+    void *pack = malloc(size);
+    if (pack) {
+      memcpy(pack, ptr, size);
+      sobj->pack = pack;
+      sobj->ty   = ty;
+      sobj->size = size;
+    } else {
+      PyObject_DEL((PyObject *) sobj);
+      sobj = 0;
+    }
+  }
+  return (PyObject *) sobj;
+}
+
+SWIGRUNTIME swig_type_info *
+SwigPyPacked_UnpackData(PyObject *obj, void *ptr, size_t size)
+{
+  if (SwigPyPacked_Check(obj)) {
+    SwigPyPacked *sobj = (SwigPyPacked *)obj;
+    if (sobj->size != size) return 0;
+    memcpy(ptr, sobj->pack, size);
+    return sobj->ty;
+  } else {
+    return 0;
+  }
+}
+
+/* -----------------------------------------------------------------------------
+ * pointers/data manipulation
+ * ----------------------------------------------------------------------------- */
+
+SWIGRUNTIMEINLINE PyObject *
+_SWIG_This(void)
+{
+    return SWIG_Python_str_FromChar("this");
+}
+
+static PyObject *swig_this = NULL;
+
+SWIGRUNTIME PyObject *
+SWIG_This(void)
+{
+  if (swig_this == NULL)
+    swig_this = _SWIG_This();
+  return swig_this;
+}
+
+/* #define SWIG_PYTHON_SLOW_GETSET_THIS */
+
+/* TODO: I don't know how to implement the fast getset in Python 3 right now */
+#if PY_VERSION_HEX>=0x03000000
+#define SWIG_PYTHON_SLOW_GETSET_THIS 
+#endif
+
+SWIGRUNTIME SwigPyObject *
+SWIG_Python_GetSwigThis(PyObject *pyobj) 
+{
+  PyObject *obj;
+
+  if (SwigPyObject_Check(pyobj))
+    return (SwigPyObject *) pyobj;
+
+#ifdef SWIGPYTHON_BUILTIN
+  (void)obj;
+# ifdef PyWeakref_CheckProxy
+  if (PyWeakref_CheckProxy(pyobj)) {
+    pyobj = PyWeakref_GET_OBJECT(pyobj);
+    if (pyobj && SwigPyObject_Check(pyobj))
+      return (SwigPyObject*) pyobj;
+  }
+# endif
+  return NULL;
+#else
+
+  obj = 0;
+
+#if (!defined(SWIG_PYTHON_SLOW_GETSET_THIS) && (PY_VERSION_HEX >= 0x02030000))
+  if (PyInstance_Check(pyobj)) {
+    obj = _PyInstance_Lookup(pyobj, SWIG_This());      
+  } else {
+    PyObject **dictptr = _PyObject_GetDictPtr(pyobj);
+    if (dictptr != NULL) {
+      PyObject *dict = *dictptr;
+      obj = dict ? PyDict_GetItem(dict, SWIG_This()) : 0;
+    } else {
+#ifdef PyWeakref_CheckProxy
+      if (PyWeakref_CheckProxy(pyobj)) {
+	PyObject *wobj = PyWeakref_GET_OBJECT(pyobj);
+	return wobj ? SWIG_Python_GetSwigThis(wobj) : 0;
+      }
+#endif
+      obj = PyObject_GetAttr(pyobj,SWIG_This());
+      if (obj) {
+	Py_DECREF(obj);
+      } else {
+	if (PyErr_Occurred()) PyErr_Clear();
+	return 0;
+      }
+    }
+  }
+#else
+  obj = PyObject_GetAttr(pyobj,SWIG_This());
+  if (obj) {
+    Py_DECREF(obj);
+  } else {
+    if (PyErr_Occurred()) PyErr_Clear();
+    return 0;
+  }
+#endif
+  if (obj && !SwigPyObject_Check(obj)) {
+    /* a PyObject is called 'this', try to get the 'real this'
+       SwigPyObject from it */ 
+    return SWIG_Python_GetSwigThis(obj);
+  }
+  return (SwigPyObject *)obj;
+#endif
+}
+
+/* Acquire a pointer value */
+
+SWIGRUNTIME int
+SWIG_Python_AcquirePtr(PyObject *obj, int own) {
+  if (own == SWIG_POINTER_OWN) {
+    SwigPyObject *sobj = SWIG_Python_GetSwigThis(obj);
+    if (sobj) {
+      int oldown = sobj->own;
+      sobj->own = own;
+      return oldown;
+    }
+  }
+  return 0;
+}
+
+/* Convert a pointer value */
+
+SWIGRUNTIME int
+SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int flags, int *own) {
+  int res;
+  SwigPyObject *sobj;
+  int implicit_conv = (flags & SWIG_POINTER_IMPLICIT_CONV) != 0;
+
+  if (!obj)
+    return SWIG_ERROR;
+  if (obj == Py_None && !implicit_conv) {
+    if (ptr)
+      *ptr = 0;
+    return SWIG_OK;
+  }
+
+  res = SWIG_ERROR;
+
+  sobj = SWIG_Python_GetSwigThis(obj);
+  if (own)
+    *own = 0;
+  while (sobj) {
+    void *vptr = sobj->ptr;
+    if (ty) {
+      swig_type_info *to = sobj->ty;
+      if (to == ty) {
+        /* no type cast needed */
+        if (ptr) *ptr = vptr;
+        break;
+      } else {
+        swig_cast_info *tc = SWIG_TypeCheck(to->name,ty);
+        if (!tc) {
+          sobj = (SwigPyObject *)sobj->next;
+        } else {
+          if (ptr) {
+            int newmemory = 0;
+            *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+            if (newmemory == SWIG_CAST_NEW_MEMORY) {
+              assert(own); /* badly formed typemap which will lead to a memory leak - it must set and use own to delete *ptr */
+              if (own)
+                *own = *own | SWIG_CAST_NEW_MEMORY;
+            }
+          }
+          break;
+        }
+      }
+    } else {
+      if (ptr) *ptr = vptr;
+      break;
+    }
+  }
+  if (sobj) {
+    if (own)
+      *own = *own | sobj->own;
+    if (flags & SWIG_POINTER_DISOWN) {
+      sobj->own = 0;
+    }
+    res = SWIG_OK;
+  } else {
+    if (implicit_conv) {
+      SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
+      if (data && !data->implicitconv) {
+        PyObject *klass = data->klass;
+        if (klass) {
+          PyObject *impconv;
+          data->implicitconv = 1; /* avoid recursion and call 'explicit' constructors*/
+          impconv = SWIG_Python_CallFunctor(klass, obj);
+          data->implicitconv = 0;
+          if (PyErr_Occurred()) {
+            PyErr_Clear();
+            impconv = 0;
+          }
+          if (impconv) {
+            SwigPyObject *iobj = SWIG_Python_GetSwigThis(impconv);
+            if (iobj) {
+              void *vptr;
+              res = SWIG_Python_ConvertPtrAndOwn((PyObject*)iobj, &vptr, ty, 0, 0);
+              if (SWIG_IsOK(res)) {
+                if (ptr) {
+                  *ptr = vptr;
+                  /* transfer the ownership to 'ptr' */
+                  iobj->own = 0;
+                  res = SWIG_AddCast(res);
+                  res = SWIG_AddNewMask(res);
+                } else {
+                  res = SWIG_AddCast(res);		    
+                }
+              }
+            }
+            Py_DECREF(impconv);
+          }
+        }
+      }
+    }
+    if (!SWIG_IsOK(res) && obj == Py_None) {
+      if (ptr)
+        *ptr = 0;
+      if (PyErr_Occurred())
+        PyErr_Clear();
+      res = SWIG_OK;
+    }
+  }
+  return res;
+}
+
+/* Convert a function ptr value */
+
+SWIGRUNTIME int
+SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) {
+  if (!PyCFunction_Check(obj)) {
+    return SWIG_ConvertPtr(obj, ptr, ty, 0);
+  } else {
+    void *vptr = 0;
+    
+    /* here we get the method pointer for callbacks */
+    const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
+    const char *desc = doc ? strstr(doc, "swig_ptr: ") : 0;
+    if (desc)
+      desc = ty ? SWIG_UnpackVoidPtr(desc + 10, &vptr, ty->name) : 0;
+    if (!desc) 
+      return SWIG_ERROR;
+    if (ty) {
+      swig_cast_info *tc = SWIG_TypeCheck(desc,ty);
+      if (tc) {
+        int newmemory = 0;
+        *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+        assert(!newmemory); /* newmemory handling not yet implemented */
+      } else {
+        return SWIG_ERROR;
+      }
+    } else {
+      *ptr = vptr;
+    }
+    return SWIG_OK;
+  }
+}
+
+/* Convert a packed value value */
+
+SWIGRUNTIME int
+SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *ty) {
+  swig_type_info *to = SwigPyPacked_UnpackData(obj, ptr, sz);
+  if (!to) return SWIG_ERROR;
+  if (ty) {
+    if (to != ty) {
+      /* check type cast? */
+      swig_cast_info *tc = SWIG_TypeCheck(to->name,ty);
+      if (!tc) return SWIG_ERROR;
+    }
+  }
+  return SWIG_OK;
+}  
+
+/* -----------------------------------------------------------------------------
+ * Create a new pointer object
+ * ----------------------------------------------------------------------------- */
+
+/*
+  Create a new instance object, without calling __init__, and set the
+  'this' attribute.
+*/
+
+SWIGRUNTIME PyObject* 
+SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this)
+{
+#if (PY_VERSION_HEX >= 0x02020000)
+  PyObject *inst = 0;
+  PyObject *newraw = data->newraw;
+  if (newraw) {
+    inst = PyObject_Call(newraw, data->newargs, NULL);
+    if (inst) {
+#if !defined(SWIG_PYTHON_SLOW_GETSET_THIS)
+      PyObject **dictptr = _PyObject_GetDictPtr(inst);
+      if (dictptr != NULL) {
+	PyObject *dict = *dictptr;
+	if (dict == NULL) {
+	  dict = PyDict_New();
+	  *dictptr = dict;
+	  PyDict_SetItem(dict, SWIG_This(), swig_this);
+	}
+      }
+#else
+      PyObject *key = SWIG_This();
+      PyObject_SetAttr(inst, key, swig_this);
+#endif
+    }
+  } else {
+#if PY_VERSION_HEX >= 0x03000000
+    inst = ((PyTypeObject*) data->newargs)->tp_new((PyTypeObject*) data->newargs, Py_None, Py_None);
+    if (inst) {
+      PyObject_SetAttr(inst, SWIG_This(), swig_this);
+      Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG;
+    }
+#else
+    PyObject *dict = PyDict_New();
+    if (dict) {
+      PyDict_SetItem(dict, SWIG_This(), swig_this);
+      inst = PyInstance_NewRaw(data->newargs, dict);
+      Py_DECREF(dict);
+    }
+#endif
+  }
+  return inst;
+#else
+#if (PY_VERSION_HEX >= 0x02010000)
+  PyObject *inst = 0;
+  PyObject *dict = PyDict_New();
+  if (dict) {
+    PyDict_SetItem(dict, SWIG_This(), swig_this);
+    inst = PyInstance_NewRaw(data->newargs, dict);
+    Py_DECREF(dict);
+  }
+  return (PyObject *) inst;
+#else
+  PyInstanceObject *inst = PyObject_NEW(PyInstanceObject, &PyInstance_Type);
+  if (inst == NULL) {
+    return NULL;
+  }
+  inst->in_class = (PyClassObject *)data->newargs;
+  Py_INCREF(inst->in_class);
+  inst->in_dict = PyDict_New();
+  if (inst->in_dict == NULL) {
+    Py_DECREF(inst);
+    return NULL;
+  }
+#ifdef Py_TPFLAGS_HAVE_WEAKREFS
+  inst->in_weakreflist = NULL;
+#endif
+#ifdef Py_TPFLAGS_GC
+  PyObject_GC_Init(inst);
+#endif
+  PyDict_SetItem(inst->in_dict, SWIG_This(), swig_this);
+  return (PyObject *) inst;
+#endif
+#endif
+}
+
+SWIGRUNTIME void
+SWIG_Python_SetSwigThis(PyObject *inst, PyObject *swig_this)
+{
+ PyObject *dict;
+#if (PY_VERSION_HEX >= 0x02020000) && !defined(SWIG_PYTHON_SLOW_GETSET_THIS)
+ PyObject **dictptr = _PyObject_GetDictPtr(inst);
+ if (dictptr != NULL) {
+   dict = *dictptr;
+   if (dict == NULL) {
+     dict = PyDict_New();
+     *dictptr = dict;
+   }
+   PyDict_SetItem(dict, SWIG_This(), swig_this);
+   return;
+ }
+#endif
+ dict = PyObject_GetAttrString(inst, (char*)"__dict__");
+ PyDict_SetItem(dict, SWIG_This(), swig_this);
+ Py_DECREF(dict);
+} 
+
+
+SWIGINTERN PyObject *
+SWIG_Python_InitShadowInstance(PyObject *args) {
+  PyObject *obj[2];
+  if (!SWIG_Python_UnpackTuple(args, "swiginit", 2, 2, obj)) {
+    return NULL;
+  } else {
+    SwigPyObject *sthis = SWIG_Python_GetSwigThis(obj[0]);
+    if (sthis) {
+      SwigPyObject_append((PyObject*) sthis, obj[1]);
+    } else {
+      SWIG_Python_SetSwigThis(obj[0], obj[1]);
+    }
+    return SWIG_Py_Void();
+  }
+}
+
+/* Create a new pointer object */
+
+SWIGRUNTIME PyObject *
+SWIG_Python_NewPointerObj(PyObject *self, void *ptr, swig_type_info *type, int flags) {
+  SwigPyClientData *clientdata;
+  PyObject * robj;
+  int own;
+
+  if (!ptr)
+    return SWIG_Py_Void();
+
+  clientdata = type ? (SwigPyClientData *)(type->clientdata) : 0;
+  own = (flags & SWIG_POINTER_OWN) ? SWIG_POINTER_OWN : 0;
+  if (clientdata && clientdata->pytype) {
+    SwigPyObject *newobj;
+    if (flags & SWIG_BUILTIN_TP_INIT) {
+      newobj = (SwigPyObject*) self;
+      if (newobj->ptr) {
+        PyObject *next_self = clientdata->pytype->tp_alloc(clientdata->pytype, 0);
+        while (newobj->next)
+	  newobj = (SwigPyObject *) newobj->next;
+        newobj->next = next_self;
+        newobj = (SwigPyObject *)next_self;
+#ifdef SWIGPYTHON_BUILTIN
+        newobj->dict = 0;
+#endif
+      }
+    } else {
+      newobj = PyObject_New(SwigPyObject, clientdata->pytype);
+#ifdef SWIGPYTHON_BUILTIN
+      newobj->dict = 0;
+#endif
+    }
+    if (newobj) {
+      newobj->ptr = ptr;
+      newobj->ty = type;
+      newobj->own = own;
+      newobj->next = 0;
+      return (PyObject*) newobj;
+    }
+    return SWIG_Py_Void();
+  }
+
+  assert(!(flags & SWIG_BUILTIN_TP_INIT));
+
+  robj = SwigPyObject_New(ptr, type, own);
+  if (robj && clientdata && !(flags & SWIG_POINTER_NOSHADOW)) {
+    PyObject *inst = SWIG_Python_NewShadowInstance(clientdata, robj);
+    Py_DECREF(robj);
+    robj = inst;
+  }
+  return robj;
+}
+
+/* Create a new packed object */
+
+SWIGRUNTIMEINLINE PyObject *
+SWIG_Python_NewPackedObj(void *ptr, size_t sz, swig_type_info *type) {
+  return ptr ? SwigPyPacked_New((void *) ptr, sz, type) : SWIG_Py_Void();
+}
+
+/* -----------------------------------------------------------------------------*
+ *  Get type list 
+ * -----------------------------------------------------------------------------*/
+
+#ifdef SWIG_LINK_RUNTIME
+void *SWIG_ReturnGlobalTypeList(void *);
+#endif
+
+SWIGRUNTIME swig_module_info *
+SWIG_Python_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
+  static void *type_pointer = (void *)0;
+  /* first check if module already created */
+  if (!type_pointer) {
+#ifdef SWIG_LINK_RUNTIME
+    type_pointer = SWIG_ReturnGlobalTypeList((void *)0);
+#else
+# ifdef SWIGPY_USE_CAPSULE
+    type_pointer = PyCapsule_Import(SWIGPY_CAPSULE_NAME, 0);
+# else
+    type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
+				    (char*)"type_pointer" SWIG_TYPE_TABLE_NAME);
+# endif
+    if (PyErr_Occurred()) {
+      PyErr_Clear();
+      type_pointer = (void *)0;
+    }
+#endif
+  }
+  return (swig_module_info *) type_pointer;
+}
+
+#if PY_MAJOR_VERSION < 2
+/* PyModule_AddObject function was introduced in Python 2.0.  The following function
+   is copied out of Python/modsupport.c in python version 2.3.4 */
+SWIGINTERN int
+PyModule_AddObject(PyObject *m, char *name, PyObject *o)
+{
+  PyObject *dict;
+  if (!PyModule_Check(m)) {
+    PyErr_SetString(PyExc_TypeError, "PyModule_AddObject() needs module as first arg");
+    return SWIG_ERROR;
+  }
+  if (!o) {
+    PyErr_SetString(PyExc_TypeError, "PyModule_AddObject() needs non-NULL value");
+    return SWIG_ERROR;
+  }
+  
+  dict = PyModule_GetDict(m);
+  if (dict == NULL) {
+    /* Internal error -- modules must have a dict! */
+    PyErr_Format(PyExc_SystemError, "module '%s' has no __dict__",
+		 PyModule_GetName(m));
+    return SWIG_ERROR;
+  }
+  if (PyDict_SetItemString(dict, name, o))
+    return SWIG_ERROR;
+  Py_DECREF(o);
+  return SWIG_OK;
+}
+#endif
+
+SWIGRUNTIME void
+#ifdef SWIGPY_USE_CAPSULE
+SWIG_Python_DestroyModule(PyObject *obj)
+#else
+SWIG_Python_DestroyModule(void *vptr)
+#endif
+{
+#ifdef SWIGPY_USE_CAPSULE
+  swig_module_info *swig_module = (swig_module_info *) PyCapsule_GetPointer(obj, SWIGPY_CAPSULE_NAME);
+#else
+  swig_module_info *swig_module = (swig_module_info *) vptr;
+#endif
+  swig_type_info **types = swig_module->types;
+  size_t i;
+  for (i =0; i < swig_module->size; ++i) {
+    swig_type_info *ty = types[i];
+    if (ty->owndata) {
+      SwigPyClientData *data = (SwigPyClientData *) ty->clientdata;
+      if (data) SwigPyClientData_Del(data);
+    }
+  }
+  Py_DECREF(SWIG_This());
+  swig_this = NULL;
+}
+
+SWIGRUNTIME void
+SWIG_Python_SetModule(swig_module_info *swig_module) {
+#if PY_VERSION_HEX >= 0x03000000
+ /* Add a dummy module object into sys.modules */
+  PyObject *module = PyImport_AddModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION);
+#else
+  static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} }; /* Sentinel */
+  PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, swig_empty_runtime_method_table);
+#endif
+#ifdef SWIGPY_USE_CAPSULE
+  PyObject *pointer = PyCapsule_New((void *) swig_module, SWIGPY_CAPSULE_NAME, SWIG_Python_DestroyModule);
+  if (pointer && module) {
+    PyModule_AddObject(module, (char*)"type_pointer_capsule" SWIG_TYPE_TABLE_NAME, pointer);
+  } else {
+    Py_XDECREF(pointer);
+  }
+#else
+  PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule);
+  if (pointer && module) {
+    PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer);
+  } else {
+    Py_XDECREF(pointer);
+  }
+#endif
+}
+
+/* The python cached type query */
+SWIGRUNTIME PyObject *
+SWIG_Python_TypeCache(void) {
+  static PyObject *SWIG_STATIC_POINTER(cache) = PyDict_New();
+  return cache;
+}
+
+SWIGRUNTIME swig_type_info *
+SWIG_Python_TypeQuery(const char *type)
+{
+  PyObject *cache = SWIG_Python_TypeCache();
+  PyObject *key = SWIG_Python_str_FromChar(type); 
+  PyObject *obj = PyDict_GetItem(cache, key);
+  swig_type_info *descriptor;
+  if (obj) {
+#ifdef SWIGPY_USE_CAPSULE
+    descriptor = (swig_type_info *) PyCapsule_GetPointer(obj, NULL);
+#else
+    descriptor = (swig_type_info *) PyCObject_AsVoidPtr(obj);
+#endif
+  } else {
+    swig_module_info *swig_module = SWIG_GetModule(0);
+    descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type);
+    if (descriptor) {
+#ifdef SWIGPY_USE_CAPSULE
+      obj = PyCapsule_New((void*) descriptor, NULL, NULL);
+#else
+      obj = PyCObject_FromVoidPtr(descriptor, NULL);
+#endif
+      PyDict_SetItem(cache, key, obj);
+      Py_DECREF(obj);
+    }
+  }
+  Py_DECREF(key);
+  return descriptor;
+}
+
+/* 
+   For backward compatibility only
+*/
+#define SWIG_POINTER_EXCEPTION  0
+#define SWIG_arg_fail(arg)      SWIG_Python_ArgFail(arg)
+#define SWIG_MustGetPtr(p, type, argnum, flags)  SWIG_Python_MustGetPtr(p, type, argnum, flags)
+
+SWIGRUNTIME int
+SWIG_Python_AddErrMesg(const char* mesg, int infront)
+{  
+  if (PyErr_Occurred()) {
+    PyObject *type = 0;
+    PyObject *value = 0;
+    PyObject *traceback = 0;
+    PyErr_Fetch(&type, &value, &traceback);
+    if (value) {
+      char *tmp;
+      PyObject *old_str = PyObject_Str(value);
+      Py_XINCREF(type);
+      PyErr_Clear();
+      if (infront) {
+	PyErr_Format(type, "%s %s", mesg, tmp = SWIG_Python_str_AsChar(old_str));
+      } else {
+	PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg);
+      }
+      SWIG_Python_str_DelForPy3(tmp);
+      Py_DECREF(old_str);
+    }
+    return 1;
+  } else {
+    return 0;
+  }
+}
+  
+SWIGRUNTIME int
+SWIG_Python_ArgFail(int argnum)
+{
+  if (PyErr_Occurred()) {
+    /* add information about failing argument */
+    char mesg[256];
+    PyOS_snprintf(mesg, sizeof(mesg), "argument number %d:", argnum);
+    return SWIG_Python_AddErrMesg(mesg, 1);
+  } else {
+    return 0;
+  }
+}
+
+SWIGRUNTIMEINLINE const char *
+SwigPyObject_GetDesc(PyObject *self)
+{
+  SwigPyObject *v = (SwigPyObject *)self;
+  swig_type_info *ty = v ? v->ty : 0;
+  return ty ? ty->str : "";
+}
+
+SWIGRUNTIME void
+SWIG_Python_TypeError(const char *type, PyObject *obj)
+{
+  if (type) {
+#if defined(SWIG_COBJECT_TYPES)
+    if (obj && SwigPyObject_Check(obj)) {
+      const char *otype = (const char *) SwigPyObject_GetDesc(obj);
+      if (otype) {
+	PyErr_Format(PyExc_TypeError, "a '%s' is expected, 'SwigPyObject(%s)' is received",
+		     type, otype);
+	return;
+      }
+    } else 
+#endif      
+    {
+      const char *otype = (obj ? obj->ob_type->tp_name : 0); 
+      if (otype) {
+	PyObject *str = PyObject_Str(obj);
+	const char *cstr = str ? SWIG_Python_str_AsChar(str) : 0;
+	if (cstr) {
+	  PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s(%s)' is received",
+		       type, otype, cstr);
+          SWIG_Python_str_DelForPy3(cstr);
+	} else {
+	  PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
+		       type, otype);
+	}
+	Py_XDECREF(str);
+	return;
+      }
+    }   
+    PyErr_Format(PyExc_TypeError, "a '%s' is expected", type);
+  } else {
+    PyErr_Format(PyExc_TypeError, "unexpected type is received");
+  }
+}
+
+
+/* Convert a pointer value, signal an exception on a type mismatch */
+SWIGRUNTIME void *
+SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int SWIGUNUSEDPARM(argnum), int flags) {
+  void *result;
+  if (SWIG_Python_ConvertPtr(obj, &result, ty, flags) == -1) {
+    PyErr_Clear();
+#if SWIG_POINTER_EXCEPTION
+    if (flags) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj);
+      SWIG_Python_ArgFail(argnum);
+    }
+#endif
+  }
+  return result;
+}
+
+#ifdef SWIGPYTHON_BUILTIN
+SWIGRUNTIME int
+SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
+  PyTypeObject *tp = obj->ob_type;
+  PyObject *descr;
+  PyObject *encoded_name;
+  descrsetfunc f;
+  int res = -1;
+
+# ifdef Py_USING_UNICODE
+  if (PyString_Check(name)) {
+    name = PyUnicode_Decode(PyString_AsString(name), PyString_Size(name), NULL, NULL);
+    if (!name)
+      return -1;
+  } else if (!PyUnicode_Check(name))
+# else
+  if (!PyString_Check(name))
+# endif
+  {
+    PyErr_Format(PyExc_TypeError, "attribute name must be string, not '%.200s'", name->ob_type->tp_name);
+    return -1;
+  } else {
+    Py_INCREF(name);
+  }
+
+  if (!tp->tp_dict) {
+    if (PyType_Ready(tp) < 0)
+      goto done;
+  }
+
+  descr = _PyType_Lookup(tp, name);
+  f = NULL;
+  if (descr != NULL)
+    f = descr->ob_type->tp_descr_set;
+  if (!f) {
+    if (PyString_Check(name)) {
+      encoded_name = name;
+      Py_INCREF(name);
+    } else {
+      encoded_name = PyUnicode_AsUTF8String(name);
+    }
+    PyErr_Format(PyExc_AttributeError, "'%.100s' object has no attribute '%.200s'", tp->tp_name, PyString_AsString(encoded_name));
+    Py_DECREF(encoded_name);
+  } else {
+    res = f(descr, obj, value);
+  }
+  
+  done:
+  Py_DECREF(name);
+  return res;
+}
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+#define SWIG_exception_fail(code, msg) do { SWIG_Error(code, msg); SWIG_fail; } while(0) 
+
+#define SWIG_contract_assert(expr, msg) if (!(expr)) { SWIG_Error(SWIG_RuntimeError, msg); SWIG_fail; } else 
+
+
+
+/* -------- TYPES TABLE (BEGIN) -------- */
+
+#define SWIGTYPE_p_char swig_types[0]
+static swig_type_info *swig_types[2];
+static swig_module_info swig_module = {swig_types, 1, 0, 0, 0, 0};
+#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
+#define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
+
+/* -------- TYPES TABLE (END) -------- */
+
+#if (PY_VERSION_HEX <= 0x02000000)
+# if !defined(SWIG_PYTHON_CLASSIC)
+#  error "This python version requires swig to be run with the '-classic' option"
+# endif
+#endif
+
+/*-----------------------------------------------
+              @(target):= _libpymolfile.so
+  ------------------------------------------------*/
+#if PY_VERSION_HEX >= 0x03000000
+#  define SWIG_init    PyInit__libpymolfile
+
+#else
+#  define SWIG_init    init_libpymolfile
+
+#endif
+#define SWIG_name    "_libpymolfile"
+
+#define SWIGVERSION 0x030012 
+#define SWIG_VERSION SWIGVERSION
+
+
+#define SWIG_as_voidptr(a) const_cast< void * >(static_cast< const void * >(a)) 
+#define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),reinterpret_cast< void** >(a)) 
+
+
+#include <stdexcept>
+
+
+namespace swig {
+  class SwigPtr_PyObject {
+  protected:
+    PyObject *_obj;
+
+  public:
+    SwigPtr_PyObject() :_obj(0)
+    {
+    }
+
+    SwigPtr_PyObject(const SwigPtr_PyObject& item) : _obj(item._obj)
+    {
+      SWIG_PYTHON_THREAD_BEGIN_BLOCK;
+      Py_XINCREF(_obj);      
+      SWIG_PYTHON_THREAD_END_BLOCK;
+    }
+    
+    SwigPtr_PyObject(PyObject *obj, bool initial_ref = true) :_obj(obj)
+    {
+      if (initial_ref) {
+        SWIG_PYTHON_THREAD_BEGIN_BLOCK;
+        Py_XINCREF(_obj);
+        SWIG_PYTHON_THREAD_END_BLOCK;
+      }
+    }
+    
+    SwigPtr_PyObject & operator=(const SwigPtr_PyObject& item) 
+    {
+      SWIG_PYTHON_THREAD_BEGIN_BLOCK;
+      Py_XINCREF(item._obj);
+      Py_XDECREF(_obj);
+      _obj = item._obj;
+      SWIG_PYTHON_THREAD_END_BLOCK;
+      return *this;      
+    }
+    
+    ~SwigPtr_PyObject() 
+    {
+      SWIG_PYTHON_THREAD_BEGIN_BLOCK;
+      Py_XDECREF(_obj);
+      SWIG_PYTHON_THREAD_END_BLOCK;
+    }
+    
+    operator PyObject *() const
+    {
+      return _obj;
+    }
+
+    PyObject *operator->() const
+    {
+      return _obj;
+    }
+  };
+}
+
+
+namespace swig {
+  struct SwigVar_PyObject : SwigPtr_PyObject {
+    SwigVar_PyObject(PyObject* obj = 0) : SwigPtr_PyObject(obj, false) { }
+    
+    SwigVar_PyObject & operator = (PyObject* obj)
+    {
+      Py_XDECREF(_obj);
+      _obj = obj;
+      return *this;      
+    }
+  };
+}
+
+
+/* Python SWIG interface to libpymolfile
+   Copyright (c) 2017 Berk Onat <b.onat@warwick.ac.uk>
+   Published with UIUC LICENSE
+ */
+#define SWIG_FILE_WITH_INIT
+#define __STDC_FORMAT_MACROS
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
+#include <inttypes.h>
+#include "pymolfile.h"
+
+
+#ifndef SWIG_FILE_WITH_INIT
+#define NO_IMPORT_ARRAY
+#endif
+#include "stdio.h"
+#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
+#include <numpy/arrayobject.h>
+
+
+#include <complex> 
+
+
+#include <limits.h>
+#if !defined(SWIG_NO_LLONG_MAX)
+# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
+#   define LLONG_MAX __LONG_LONG_MAX__
+#   define LLONG_MIN (-LLONG_MAX - 1LL)
+#   define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
+# endif
+#endif
+
+
+SWIGINTERN int
+SWIG_AsVal_double (PyObject *obj, double *val)
+{
+  int res = SWIG_TypeError;
+  if (PyFloat_Check(obj)) {
+    if (val) *val = PyFloat_AsDouble(obj);
+    return SWIG_OK;
+#if PY_VERSION_HEX < 0x03000000
+  } else if (PyInt_Check(obj)) {
+    if (val) *val = (double) PyInt_AsLong(obj);
+    return SWIG_OK;
+#endif
+  } else if (PyLong_Check(obj)) {
+    double v = PyLong_AsDouble(obj);
+    if (!PyErr_Occurred()) {
+      if (val) *val = v;
+      return SWIG_OK;
+    } else {
+      PyErr_Clear();
+    }
+  }
+#ifdef SWIG_PYTHON_CAST_MODE
+  {
+    int dispatch = 0;
+    double d = PyFloat_AsDouble(obj);
+    if (!PyErr_Occurred()) {
+      if (val) *val = d;
+      return SWIG_AddCast(SWIG_OK);
+    } else {
+      PyErr_Clear();
+    }
+    if (!dispatch) {
+      long v = PyLong_AsLong(obj);
+      if (!PyErr_Occurred()) {
+	if (val) *val = v;
+	return SWIG_AddCast(SWIG_AddCast(SWIG_OK));
+      } else {
+	PyErr_Clear();
+      }
+    }
+  }
+#endif
+  return res;
+}
+
+
+#include <float.h>
+
+
+#include <math.h>
+
+
+SWIGINTERNINLINE int
+SWIG_CanCastAsInteger(double *d, double min, double max) {
+  double x = *d;
+  if ((min <= x && x <= max)) {
+   double fx = floor(x);
+   double cx = ceil(x);
+   double rd =  ((x - fx) < 0.5) ? fx : cx; /* simple rint */
+   if ((errno == EDOM) || (errno == ERANGE)) {
+     errno = 0;
+   } else {
+     double summ, reps, diff;
+     if (rd < x) {
+       diff = x - rd;
+     } else if (rd > x) {
+       diff = rd - x;
+     } else {
+       return 1;
+     }
+     summ = rd + x;
+     reps = diff/summ;
+     if (reps < 8*DBL_EPSILON) {
+       *d = rd;
+       return 1;
+     }
+   }
+  }
+  return 0;
+}
+
+
+SWIGINTERN int
+SWIG_AsVal_long (PyObject *obj, long* val)
+{
+#if PY_VERSION_HEX < 0x03000000
+  if (PyInt_Check(obj)) {
+    if (val) *val = PyInt_AsLong(obj);
+    return SWIG_OK;
+  } else
+#endif
+  if (PyLong_Check(obj)) {
+    long v = PyLong_AsLong(obj);
+    if (!PyErr_Occurred()) {
+      if (val) *val = v;
+      return SWIG_OK;
+    } else {
+      PyErr_Clear();
+      return SWIG_OverflowError;
+    }
+  }
+#ifdef SWIG_PYTHON_CAST_MODE
+  {
+    int dispatch = 0;
+    long v = PyInt_AsLong(obj);
+    if (!PyErr_Occurred()) {
+      if (val) *val = v;
+      return SWIG_AddCast(SWIG_OK);
+    } else {
+      PyErr_Clear();
+    }
+    if (!dispatch) {
+      double d;
+      int res = SWIG_AddCast(SWIG_AsVal_double (obj,&d));
+      if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, LONG_MIN, LONG_MAX)) {
+	if (val) *val = (long)(d);
+	return res;
+      }
+    }
+  }
+#endif
+  return SWIG_TypeError;
+}
+
+
+SWIGINTERN int
+SWIG_AsVal_int (PyObject * obj, int *val)
+{
+  long v;
+  int res = SWIG_AsVal_long (obj, &v);
+  if (SWIG_IsOK(res)) {
+    if ((v < INT_MIN || v > INT_MAX)) {
+      return SWIG_OverflowError;
+    } else {
+      if (val) *val = static_cast< int >(v);
+    }
+  }  
+  return res;
+}
+
+
+SWIGINTERNINLINE PyObject*
+  SWIG_From_int  (int value)
+{
+  return PyInt_FromLong((long) value);
+}
+
+
+PyObject * my_open_file_read(PyObject* molcapsule, char* fname, char* ftype, int natoms) {
+    if (PyType_Ready(&MolObjectType) < 0)
+        return NULL;
+    PyTypeObject *type = &MolObjectType;
+    MolObject *plugin_c;
+    molfile_plugin_t* plugin = (molfile_plugin_t*) PyMolfileCapsule_AsVoidPtr(molcapsule);
+    plugin_c = (MolObject *)type->tp_alloc(type, 0);
+    /*plugin_c->plugin = plugin;*/
+    plugin_c->plugin = molcapsule;
+    void *file_handle = plugin->open_file_read(fname, ftype, &natoms);
+    plugin_c->file_handle = PyMolfileCapsule_FromVoidPtr(file_handle, del_molfile_file_handle);
+    if (!plugin_c->file_handle) {
+        Py_RETURN_NONE;
+    } else {
+        plugin_c->natoms = natoms;
+        return (PyObject *)plugin_c;
+    }
+  }
+
+
+SWIGINTERN swig_type_info*
+SWIG_pchar_descriptor(void)
+{
+  static int init = 0;
+  static swig_type_info* info = 0;
+  if (!init) {
+    info = SWIG_TypeQuery("_p_char");
+    init = 1;
+  }
+  return info;
+}
+
+
+SWIGINTERN int
+SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
+{
+#if PY_VERSION_HEX>=0x03000000
+#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
+  if (PyBytes_Check(obj))
+#else
+  if (PyUnicode_Check(obj))
+#endif
+#else  
+  if (PyString_Check(obj))
+#endif
+  {
+    char *cstr; Py_ssize_t len;
+#if PY_VERSION_HEX>=0x03000000
+#if !defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
+    if (!alloc && cptr) {
+        /* We can't allow converting without allocation, since the internal
+           representation of string in Python 3 is UCS-2/UCS-4 but we require
+           a UTF-8 representation.
+           TODO(bhy) More detailed explanation */
+        return SWIG_RuntimeError;
+    }
+    obj = PyUnicode_AsUTF8String(obj);
+    if(alloc) *alloc = SWIG_NEWOBJ;
+#endif
+    PyBytes_AsStringAndSize(obj, &cstr, &len);
+#else
+    PyString_AsStringAndSize(obj, &cstr, &len);
+#endif
+    if (cptr) {
+      if (alloc) {
+	/* 
+	   In python the user should not be able to modify the inner
+	   string representation. To warranty that, if you define
+	   SWIG_PYTHON_SAFE_CSTRINGS, a new/copy of the python string
+	   buffer is always returned.
+
+	   The default behavior is just to return the pointer value,
+	   so, be careful.
+	*/ 
+#if defined(SWIG_PYTHON_SAFE_CSTRINGS)
+	if (*alloc != SWIG_OLDOBJ) 
+#else
+	if (*alloc == SWIG_NEWOBJ) 
+#endif
+	{
+	  *cptr = reinterpret_cast< char* >(memcpy(new char[len + 1], cstr, sizeof(char)*(len + 1)));
+	  *alloc = SWIG_NEWOBJ;
+	} else {
+	  *cptr = cstr;
+	  *alloc = SWIG_OLDOBJ;
+	}
+      } else {
+#if PY_VERSION_HEX>=0x03000000
+#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
+	*cptr = PyBytes_AsString(obj);
+#else
+	assert(0); /* Should never reach here with Unicode strings in Python 3 */
+#endif
+#else
+	*cptr = SWIG_Python_str_AsChar(obj);
+#endif
+      }
+    }
+    if (psize) *psize = len + 1;
+#if PY_VERSION_HEX>=0x03000000 && !defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
+    Py_XDECREF(obj);
+#endif
+    return SWIG_OK;
+  } else {
+#if defined(SWIG_PYTHON_2_UNICODE)
+#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
+#error "Cannot use both SWIG_PYTHON_2_UNICODE and SWIG_PYTHON_STRICT_BYTE_CHAR at once"
+#endif
+#if PY_VERSION_HEX<0x03000000
+    if (PyUnicode_Check(obj)) {
+      char *cstr; Py_ssize_t len;
+      if (!alloc && cptr) {
+        return SWIG_RuntimeError;
+      }
+      obj = PyUnicode_AsUTF8String(obj);
+      if (PyString_AsStringAndSize(obj, &cstr, &len) != -1) {
+        if (cptr) {
+          if (alloc) *alloc = SWIG_NEWOBJ;
+          *cptr = reinterpret_cast< char* >(memcpy(new char[len + 1], cstr, sizeof(char)*(len + 1)));
+        }
+        if (psize) *psize = len + 1;
+
+        Py_XDECREF(obj);
+        return SWIG_OK;
+      } else {
+        Py_XDECREF(obj);
+      }
+    }
+#endif
+#endif
+
+    swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
+    if (pchar_descriptor) {
+      void* vptr = 0;
+      if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) {
+	if (cptr) *cptr = (char *) vptr;
+	if (psize) *psize = vptr ? (strlen((char *)vptr) + 1) : 0;
+	if (alloc) *alloc = SWIG_OLDOBJ;
+	return SWIG_OK;
+      }
+    }
+  }
+  return SWIG_TypeError;
+}
+
+
+
+
+
+PyObject * my_close_file_read(PyObject* molpack) {
+    MolObject* plugin_handle = (MolObject*) molpack;
+    PyObject* plugincapsule = plugin_handle->plugin;   
+    PyObject* filecapsule = plugin_handle->file_handle;
+    molfile_plugin_t* plugin = (molfile_plugin_t*) PyMolfileCapsule_AsVoidPtr(plugincapsule);
+    void *file_handle = (void*) PyMolfileCapsule_AsVoidPtr(filecapsule);
+    plugin->close_file_read(file_handle);
+    Py_XDECREF(filecapsule);
+    Py_XDECREF(plugin_handle->file_handle);
+    return (PyObject *)plugin_handle;
+  }
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+SWIGINTERN PyObject *_wrap_molfile_plugin_list(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:molfile_plugin_list",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "molfile_plugin_list" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  result = (PyObject *)molfile_plugin_list(arg1);
+  resultobj = result;
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_molfile_init(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)":molfile_init")) SWIG_fail;
+  result = (int)molfile_init();
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_molfile_finish(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)":molfile_finish")) SWIG_fail;
+  result = (int)molfile_finish();
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_get_plugin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  int arg2 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:get_plugin",&obj0,&obj1)) SWIG_fail;
+  arg1 = obj0;
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "get_plugin" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  result = (PyObject *)get_plugin(arg1,arg2);
+  resultobj = result;
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_molfile_plugin_info(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  int arg2 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:molfile_plugin_info",&obj0,&obj1)) SWIG_fail;
+  arg1 = obj0;
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "molfile_plugin_info" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  result = (PyObject *)molfile_plugin_info(arg1,arg2);
+  resultobj = result;
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_open_file_read(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int arg4 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:open_file_read",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  arg1 = obj0;
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "open_file_read" "', argument " "2"" of type '" "char *""'");
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "open_file_read" "', argument " "3"" of type '" "char *""'");
+  }
+  arg3 = reinterpret_cast< char * >(buf3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "open_file_read" "', argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  {
+    result = (PyObject *)my_open_file_read(arg1,arg2,arg3,arg4);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = result;
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+  return resultobj;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_close_file_read(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:close_file_read",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  {
+    result = (PyObject *)my_close_file_read(arg1);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = result;
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_read_fill_structure(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:read_fill_structure",&obj0,&obj1)) SWIG_fail;
+  arg1 = obj0;
+  arg2 = obj1;
+  result = (PyObject *)read_fill_structure(arg1,arg2);
+  resultobj = result;
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_read_fill_bonds(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:read_fill_bonds",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  result = (PyObject *)read_fill_bonds(arg1);
+  resultobj = result;
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_read_fill_angles(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:read_fill_angles",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  result = (PyObject *)read_fill_angles(arg1);
+  resultobj = result;
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_read_fill_next_timestep(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:read_fill_next_timestep",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  result = (PyObject *)read_fill_next_timestep(arg1);
+  resultobj = result;
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_are_plugins_same(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:are_plugins_same",&obj0,&obj1)) SWIG_fail;
+  arg1 = obj0;
+  arg2 = obj1;
+  result = (PyObject *)are_plugins_same(arg1,arg2);
+  resultobj = result;
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_are_filehandles_same(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:are_filehandles_same",&obj0,&obj1)) SWIG_fail;
+  arg1 = obj0;
+  arg2 = obj1;
+  result = (PyObject *)are_filehandles_same(arg1,arg2);
+  resultobj = result;
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+static PyMethodDef SwigMethods[] = {
+	 { (char *)"SWIG_PyInstanceMethod_New", (PyCFunction)SWIG_PyInstanceMethod_New, METH_O, NULL},
+	 { (char *)"molfile_plugin_list", _wrap_molfile_plugin_list, METH_VARARGS, (char *)"molfile_plugin_list(maxsize) -> PyObject *"},
+	 { (char *)"molfile_init", _wrap_molfile_init, METH_VARARGS, (char *)"molfile_init() -> int"},
+	 { (char *)"molfile_finish", _wrap_molfile_finish, METH_VARARGS, (char *)"molfile_finish() -> int"},
+	 { (char *)"get_plugin", _wrap_get_plugin, METH_VARARGS, (char *)"get_plugin(molcapsule, plug_no) -> PyObject *"},
+	 { (char *)"molfile_plugin_info", _wrap_molfile_plugin_info, METH_VARARGS, (char *)"molfile_plugin_info(molcapsule, plugin_no) -> PyObject *"},
+	 { (char *)"open_file_read", _wrap_open_file_read, METH_VARARGS, (char *)"open_file_read(molcapsule, fname, ftype, natoms) -> PyObject *"},
+	 { (char *)"close_file_read", _wrap_close_file_read, METH_VARARGS, (char *)"close_file_read(molpack) -> PyObject *"},
+	 { (char *)"read_fill_structure", _wrap_read_fill_structure, METH_VARARGS, (char *)"read_fill_structure(molpack, prototype) -> PyObject *"},
+	 { (char *)"read_fill_bonds", _wrap_read_fill_bonds, METH_VARARGS, (char *)"read_fill_bonds(molpack) -> PyObject *"},
+	 { (char *)"read_fill_angles", _wrap_read_fill_angles, METH_VARARGS, (char *)"read_fill_angles(molpack) -> PyObject *"},
+	 { (char *)"read_fill_next_timestep", _wrap_read_fill_next_timestep, METH_VARARGS, (char *)"read_fill_next_timestep(molpack) -> PyObject *"},
+	 { (char *)"are_plugins_same", _wrap_are_plugins_same, METH_VARARGS, (char *)"are_plugins_same(molpack_a, molpack_b) -> PyObject *"},
+	 { (char *)"are_filehandles_same", _wrap_are_filehandles_same, METH_VARARGS, (char *)"are_filehandles_same(molpack_a, molpack_b) -> PyObject *"},
+	 { NULL, NULL, 0, NULL }
+};
+
+
+/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
+
+static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
+
+static swig_type_info *swig_type_initial[] = {
+  &_swigt__p_char,
+};
+
+static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
+
+static swig_cast_info *swig_cast_initial[] = {
+  _swigc__p_char,
+};
+
+
+/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
+
+static swig_const_info swig_const_table[] = {
+{0, 0, 0, 0.0, 0, 0}};
+
+#ifdef __cplusplus
+}
+#endif
+/* -----------------------------------------------------------------------------
+ * Type initialization:
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
+ * swig_cast_info structures and swig_cast_info structures store pointers back
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
+ * swig_module, and does all the lookup, filling in the swig_module.types
+ * array with the correct data and linking the correct swig_cast_info
+ * structures together.
+ *
+ * The generated swig_type_info structures are assigned statically to an initial
+ * array. We just loop through that array, and handle each type individually.
+ * First we lookup if this type has been already loaded, and if so, use the
+ * loaded structure instead of the generated one. Then we have to fill in the
+ * cast linked list. The cast data is initially stored in something like a
+ * two-dimensional array. Each row corresponds to a type (there are the same
+ * number of rows as there are in the swig_type_initial array). Each entry in
+ * a column is one of the swig_cast_info structures for that type.
+ * The cast_initial array is actually an array of arrays, because each row has
+ * a variable number of columns. So to actually build the cast linked list,
+ * we find the array of casts associated with the type, and loop through it
+ * adding the casts to the list. The one last trick we need to do is making
+ * sure the type pointer in the swig_cast_info struct is correct.
+ *
+ * First off, we lookup the cast->type name to see if it is already loaded.
+ * There are three cases to handle:
+ *  1) If the cast->type has already been loaded AND the type we are adding
+ *     casting info to has not been loaded (it is in this module), THEN we
+ *     replace the cast->type pointer with the type pointer that has already
+ *     been loaded.
+ *  2) If BOTH types (the one we are adding casting info to, and the
+ *     cast->type) are loaded, THEN the cast info has already been loaded by
+ *     the previous module so we just ignore it.
+ *  3) Finally, if cast->type has not already been loaded, then we add that
+ *     swig_cast_info to the linked list (because the cast->type) pointer will
+ *     be correct.
+ * ----------------------------------------------------------------------------- */
+
+#ifdef __cplusplus
+extern "C" {
+#if 0
+} /* c-mode */
+#endif
+#endif
+
+#if 0
+#define SWIGRUNTIME_DEBUG
+#endif
+
+
+SWIGRUNTIME void
+SWIG_InitializeModule(void *clientdata) {
+  size_t i;
+  swig_module_info *module_head, *iter;
+  int init;
+  
+  /* check to see if the circular list has been setup, if not, set it up */
+  if (swig_module.next==0) {
+    /* Initialize the swig_module */
+    swig_module.type_initial = swig_type_initial;
+    swig_module.cast_initial = swig_cast_initial;
+    swig_module.next = &swig_module;
+    init = 1;
+  } else {
+    init = 0;
+  }
+  
+  /* Try and load any already created modules */
+  module_head = SWIG_GetModule(clientdata);
+  if (!module_head) {
+    /* This is the first module loaded for this interpreter */
+    /* so set the swig module into the interpreter */
+    SWIG_SetModule(clientdata, &swig_module);
+  } else {
+    /* the interpreter has loaded a SWIG module, but has it loaded this one? */
+    iter=module_head;
+    do {
+      if (iter==&swig_module) {
+        /* Our module is already in the list, so there's nothing more to do. */
+        return;
+      }
+      iter=iter->next;
+    } while (iter!= module_head);
+    
+    /* otherwise we must add our module into the list */
+    swig_module.next = module_head->next;
+    module_head->next = &swig_module;
+  }
+  
+  /* When multiple interpreters are used, a module could have already been initialized in
+       a different interpreter, but not yet have a pointer in this interpreter.
+       In this case, we do not want to continue adding types... everything should be
+       set up already */
+  if (init == 0) return;
+  
+  /* Now work on filling in swig_module.types */
+#ifdef SWIGRUNTIME_DEBUG
+  printf("SWIG_InitializeModule: size %d\n", swig_module.size);
+#endif
+  for (i = 0; i < swig_module.size; ++i) {
+    swig_type_info *type = 0;
+    swig_type_info *ret;
+    swig_cast_info *cast;
+    
+#ifdef SWIGRUNTIME_DEBUG
+    printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
+#endif
+    
+    /* if there is another module already loaded */
+    if (swig_module.next != &swig_module) {
+      type = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, swig_module.type_initial[i]->name);
+    }
+    if (type) {
+      /* Overwrite clientdata field */
+#ifdef SWIGRUNTIME_DEBUG
+      printf("SWIG_InitializeModule: found type %s\n", type->name);
+#endif
+      if (swig_module.type_initial[i]->clientdata) {
+        type->clientdata = swig_module.type_initial[i]->clientdata;
+#ifdef SWIGRUNTIME_DEBUG
+        printf("SWIG_InitializeModule: found and overwrite type %s \n", type->name);
+#endif
+      }
+    } else {
+      type = swig_module.type_initial[i];
+    }
+    
+    /* Insert casting types */
+    cast = swig_module.cast_initial[i];
+    while (cast->type) {
+      /* Don't need to add information already in the list */
+      ret = 0;
+#ifdef SWIGRUNTIME_DEBUG
+      printf("SWIG_InitializeModule: look cast %s\n", cast->type->name);
+#endif
+      if (swig_module.next != &swig_module) {
+        ret = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, cast->type->name);
+#ifdef SWIGRUNTIME_DEBUG
+        if (ret) printf("SWIG_InitializeModule: found cast %s\n", ret->name);
+#endif
+      }
+      if (ret) {
+        if (type == swig_module.type_initial[i]) {
+#ifdef SWIGRUNTIME_DEBUG
+          printf("SWIG_InitializeModule: skip old type %s\n", ret->name);
+#endif
+          cast->type = ret;
+          ret = 0;
+        } else {
+          /* Check for casting already in the list */
+          swig_cast_info *ocast = SWIG_TypeCheck(ret->name, type);
+#ifdef SWIGRUNTIME_DEBUG
+          if (ocast) printf("SWIG_InitializeModule: skip old cast %s\n", ret->name);
+#endif
+          if (!ocast) ret = 0;
+        }
+      }
+      
+      if (!ret) {
+#ifdef SWIGRUNTIME_DEBUG
+        printf("SWIG_InitializeModule: adding cast %s\n", cast->type->name);
+#endif
+        if (type->cast) {
+          type->cast->prev = cast;
+          cast->next = type->cast;
+        }
+        type->cast = cast;
+      }
+      cast++;
+    }
+    /* Set entry in modules->types array equal to the type */
+    swig_module.types[i] = type;
+  }
+  swig_module.types[i] = 0;
+  
+#ifdef SWIGRUNTIME_DEBUG
+  printf("**** SWIG_InitializeModule: Cast List ******\n");
+  for (i = 0; i < swig_module.size; ++i) {
+    int j = 0;
+    swig_cast_info *cast = swig_module.cast_initial[i];
+    printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
+    while (cast->type) {
+      printf("SWIG_InitializeModule: cast type %s\n", cast->type->name);
+      cast++;
+      ++j;
+    }
+    printf("---- Total casts: %d\n",j);
+  }
+  printf("**** SWIG_InitializeModule: Cast List ******\n");
+#endif
+}
+
+/* This function will propagate the clientdata field of type to
+* any new swig_type_info structures that have been added into the list
+* of equivalent types.  It is like calling
+* SWIG_TypeClientData(type, clientdata) a second time.
+*/
+SWIGRUNTIME void
+SWIG_PropagateClientData(void) {
+  size_t i;
+  swig_cast_info *equiv;
+  static int init_run = 0;
+  
+  if (init_run) return;
+  init_run = 1;
+  
+  for (i = 0; i < swig_module.size; i++) {
+    if (swig_module.types[i]->clientdata) {
+      equiv = swig_module.types[i]->cast;
+      while (equiv) {
+        if (!equiv->converter) {
+          if (equiv->type && !equiv->type->clientdata)
+          SWIG_TypeClientData(equiv->type, swig_module.types[i]->clientdata);
+        }
+        equiv = equiv->next;
+      }
+    }
+  }
+}
+
+#ifdef __cplusplus
+#if 0
+{
+  /* c-mode */
+#endif
+}
+#endif
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+  
+  /* Python-specific SWIG API */
+#define SWIG_newvarlink()                             SWIG_Python_newvarlink()
+#define SWIG_addvarlink(p, name, get_attr, set_attr)  SWIG_Python_addvarlink(p, name, get_attr, set_attr)
+#define SWIG_InstallConstants(d, constants)           SWIG_Python_InstallConstants(d, constants)
+  
+  /* -----------------------------------------------------------------------------
+   * global variable support code.
+   * ----------------------------------------------------------------------------- */
+  
+  typedef struct swig_globalvar {
+    char       *name;                  /* Name of global variable */
+    PyObject *(*get_attr)(void);       /* Return the current value */
+    int       (*set_attr)(PyObject *); /* Set the value */
+    struct swig_globalvar *next;
+  } swig_globalvar;
+  
+  typedef struct swig_varlinkobject {
+    PyObject_HEAD
+    swig_globalvar *vars;
+  } swig_varlinkobject;
+  
+  SWIGINTERN PyObject *
+  swig_varlink_repr(swig_varlinkobject *SWIGUNUSEDPARM(v)) {
+#if PY_VERSION_HEX >= 0x03000000
+    return PyUnicode_InternFromString("<Swig global variables>");
+#else
+    return PyString_FromString("<Swig global variables>");
+#endif
+  }
+  
+  SWIGINTERN PyObject *
+  swig_varlink_str(swig_varlinkobject *v) {
+#if PY_VERSION_HEX >= 0x03000000
+    PyObject *str = PyUnicode_InternFromString("(");
+    PyObject *tail;
+    PyObject *joined;
+    swig_globalvar *var;
+    for (var = v->vars; var; var=var->next) {
+      tail = PyUnicode_FromString(var->name);
+      joined = PyUnicode_Concat(str, tail);
+      Py_DecRef(str);
+      Py_DecRef(tail);
+      str = joined;
+      if (var->next) {
+        tail = PyUnicode_InternFromString(", ");
+        joined = PyUnicode_Concat(str, tail);
+        Py_DecRef(str);
+        Py_DecRef(tail);
+        str = joined;
+      }
+    }
+    tail = PyUnicode_InternFromString(")");
+    joined = PyUnicode_Concat(str, tail);
+    Py_DecRef(str);
+    Py_DecRef(tail);
+    str = joined;
+#else
+    PyObject *str = PyString_FromString("(");
+    swig_globalvar *var;
+    for (var = v->vars; var; var=var->next) {
+      PyString_ConcatAndDel(&str,PyString_FromString(var->name));
+      if (var->next) PyString_ConcatAndDel(&str,PyString_FromString(", "));
+    }
+    PyString_ConcatAndDel(&str,PyString_FromString(")"));
+#endif
+    return str;
+  }
+  
+  SWIGINTERN int
+  swig_varlink_print(swig_varlinkobject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) {
+    char *tmp;
+    PyObject *str = swig_varlink_str(v);
+    fprintf(fp,"Swig global variables ");
+    fprintf(fp,"%s\n", tmp = SWIG_Python_str_AsChar(str));
+    SWIG_Python_str_DelForPy3(tmp);
+    Py_DECREF(str);
+    return 0;
+  }
+  
+  SWIGINTERN void
+  swig_varlink_dealloc(swig_varlinkobject *v) {
+    swig_globalvar *var = v->vars;
+    while (var) {
+      swig_globalvar *n = var->next;
+      free(var->name);
+      free(var);
+      var = n;
+    }
+  }
+  
+  SWIGINTERN PyObject *
+  swig_varlink_getattr(swig_varlinkobject *v, char *n) {
+    PyObject *res = NULL;
+    swig_globalvar *var = v->vars;
+    while (var) {
+      if (strcmp(var->name,n) == 0) {
+        res = (*var->get_attr)();
+        break;
+      }
+      var = var->next;
+    }
+    if (res == NULL && !PyErr_Occurred()) {
+      PyErr_Format(PyExc_AttributeError, "Unknown C global variable '%s'", n);
+    }
+    return res;
+  }
+  
+  SWIGINTERN int
+  swig_varlink_setattr(swig_varlinkobject *v, char *n, PyObject *p) {
+    int res = 1;
+    swig_globalvar *var = v->vars;
+    while (var) {
+      if (strcmp(var->name,n) == 0) {
+        res = (*var->set_attr)(p);
+        break;
+      }
+      var = var->next;
+    }
+    if (res == 1 && !PyErr_Occurred()) {
+      PyErr_Format(PyExc_AttributeError, "Unknown C global variable '%s'", n);
+    }
+    return res;
+  }
+  
+  SWIGINTERN PyTypeObject*
+  swig_varlink_type(void) {
+    static char varlink__doc__[] = "Swig var link object";
+    static PyTypeObject varlink_type;
+    static int type_init = 0;
+    if (!type_init) {
+      const PyTypeObject tmp = {
+#if PY_VERSION_HEX >= 0x03000000
+        PyVarObject_HEAD_INIT(NULL, 0)
+#else
+        PyObject_HEAD_INIT(NULL)
+        0,                                  /* ob_size */
+#endif
+        (char *)"swigvarlink",              /* tp_name */
+        sizeof(swig_varlinkobject),         /* tp_basicsize */
+        0,                                  /* tp_itemsize */
+        (destructor) swig_varlink_dealloc,  /* tp_dealloc */
+        (printfunc) swig_varlink_print,     /* tp_print */
+        (getattrfunc) swig_varlink_getattr, /* tp_getattr */
+        (setattrfunc) swig_varlink_setattr, /* tp_setattr */
+        0,                                  /* tp_compare */
+        (reprfunc) swig_varlink_repr,       /* tp_repr */
+        0,                                  /* tp_as_number */
+        0,                                  /* tp_as_sequence */
+        0,                                  /* tp_as_mapping */
+        0,                                  /* tp_hash */
+        0,                                  /* tp_call */
+        (reprfunc) swig_varlink_str,        /* tp_str */
+        0,                                  /* tp_getattro */
+        0,                                  /* tp_setattro */
+        0,                                  /* tp_as_buffer */
+        0,                                  /* tp_flags */
+        varlink__doc__,                     /* tp_doc */
+        0,                                  /* tp_traverse */
+        0,                                  /* tp_clear */
+        0,                                  /* tp_richcompare */
+        0,                                  /* tp_weaklistoffset */
+#if PY_VERSION_HEX >= 0x02020000
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */
+#endif
+#if PY_VERSION_HEX >= 0x02030000
+        0,                                  /* tp_del */
+#endif
+#if PY_VERSION_HEX >= 0x02060000
+        0,                                  /* tp_version_tag */
+#endif
+#if PY_VERSION_HEX >= 0x03040000
+        0,                                  /* tp_finalize */
+#endif
+#ifdef COUNT_ALLOCS
+        0,                                  /* tp_allocs */
+        0,                                  /* tp_frees */
+        0,                                  /* tp_maxalloc */
+#if PY_VERSION_HEX >= 0x02050000
+        0,                                  /* tp_prev */
+#endif
+        0                                   /* tp_next */
+#endif
+      };
+      varlink_type = tmp;
+      type_init = 1;
+#if PY_VERSION_HEX < 0x02020000
+      varlink_type.ob_type = &PyType_Type;
+#else
+      if (PyType_Ready(&varlink_type) < 0)
+      return NULL;
+#endif
+    }
+    return &varlink_type;
+  }
+  
+  /* Create a variable linking object for use later */
+  SWIGINTERN PyObject *
+  SWIG_Python_newvarlink(void) {
+    swig_varlinkobject *result = PyObject_NEW(swig_varlinkobject, swig_varlink_type());
+    if (result) {
+      result->vars = 0;
+    }
+    return ((PyObject*) result);
+  }
+  
+  SWIGINTERN void 
+  SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
+    swig_varlinkobject *v = (swig_varlinkobject *) p;
+    swig_globalvar *gv = (swig_globalvar *) malloc(sizeof(swig_globalvar));
+    if (gv) {
+      size_t size = strlen(name)+1;
+      gv->name = (char *)malloc(size);
+      if (gv->name) {
+        strncpy(gv->name,name,size);
+        gv->get_attr = get_attr;
+        gv->set_attr = set_attr;
+        gv->next = v->vars;
+      }
+    }
+    v->vars = gv;
+  }
+  
+  SWIGINTERN PyObject *
+  SWIG_globals(void) {
+    static PyObject *_SWIG_globals = 0; 
+    if (!_SWIG_globals) _SWIG_globals = SWIG_newvarlink();  
+    return _SWIG_globals;
+  }
+  
+  /* -----------------------------------------------------------------------------
+   * constants/methods manipulation
+   * ----------------------------------------------------------------------------- */
+  
+  /* Install Constants */
+  SWIGINTERN void
+  SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]) {
+    PyObject *obj = 0;
+    size_t i;
+    for (i = 0; constants[i].type; ++i) {
+      switch(constants[i].type) {
+      case SWIG_PY_POINTER:
+        obj = SWIG_InternalNewPointerObj(constants[i].pvalue, *(constants[i]).ptype,0);
+        break;
+      case SWIG_PY_BINARY:
+        obj = SWIG_NewPackedObj(constants[i].pvalue, constants[i].lvalue, *(constants[i].ptype));
+        break;
+      default:
+        obj = 0;
+        break;
+      }
+      if (obj) {
+        PyDict_SetItemString(d, constants[i].name, obj);
+        Py_DECREF(obj);
+      }
+    }
+  }
+  
+  /* -----------------------------------------------------------------------------*/
+  /* Fix SwigMethods to carry the callback ptrs when needed */
+  /* -----------------------------------------------------------------------------*/
+  
+  SWIGINTERN void
+  SWIG_Python_FixMethods(PyMethodDef *methods,
+    swig_const_info *const_table,
+    swig_type_info **types,
+    swig_type_info **types_initial) {
+    size_t i;
+    for (i = 0; methods[i].ml_name; ++i) {
+      const char *c = methods[i].ml_doc;
+      if (!c) continue;
+      c = strstr(c, "swig_ptr: ");
+      if (c) {
+        int j;
+        swig_const_info *ci = 0;
+        const char *name = c + 10;
+        for (j = 0; const_table[j].type; ++j) {
+          if (strncmp(const_table[j].name, name, 
+              strlen(const_table[j].name)) == 0) {
+            ci = &(const_table[j]);
+            break;
+          }
+        }
+        if (ci) {
+          void *ptr = (ci->type == SWIG_PY_POINTER) ? ci->pvalue : 0;
+          if (ptr) {
+            size_t shift = (ci->ptype) - types;
+            swig_type_info *ty = types_initial[shift];
+            size_t ldoc = (c - methods[i].ml_doc);
+            size_t lptr = strlen(ty->name)+2*sizeof(void*)+2;
+            char *ndoc = (char*)malloc(ldoc + lptr + 10);
+            if (ndoc) {
+              char *buff = ndoc;
+              strncpy(buff, methods[i].ml_doc, ldoc);
+              buff += ldoc;
+              strncpy(buff, "swig_ptr: ", 10);
+              buff += 10;
+              SWIG_PackVoidPtr(buff, ptr, ty->name, lptr);
+              methods[i].ml_doc = ndoc;
+            }
+          }
+        }
+      }
+    }
+  } 
+  
+#ifdef __cplusplus
+}
+#endif
+
+/* -----------------------------------------------------------------------------*
+ *  Partial Init method
+ * -----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+extern "C"
+#endif
+
+SWIGEXPORT 
+#if PY_VERSION_HEX >= 0x03000000
+PyObject*
+#else
+void
+#endif
+SWIG_init(void) {
+  PyObject *m, *d, *md;
+#if PY_VERSION_HEX >= 0x03000000
+  static struct PyModuleDef SWIG_module = {
+# if PY_VERSION_HEX >= 0x03020000
+    PyModuleDef_HEAD_INIT,
+# else
+    {
+      PyObject_HEAD_INIT(NULL)
+      NULL, /* m_init */
+      0,    /* m_index */
+      NULL, /* m_copy */
+    },
+# endif
+    (char *) SWIG_name,
+    NULL,
+    -1,
+    SwigMethods,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  };
+#endif
+  
+#if defined(SWIGPYTHON_BUILTIN)
+  static SwigPyClientData SwigPyObject_clientdata = {
+    0, 0, 0, 0, 0, 0, 0
+  };
+  static PyGetSetDef this_getset_def = {
+    (char *)"this", &SwigPyBuiltin_ThisClosure, NULL, NULL, NULL
+  };
+  static SwigPyGetSet thisown_getset_closure = {
+    (PyCFunction) SwigPyObject_own,
+    (PyCFunction) SwigPyObject_own
+  };
+  static PyGetSetDef thisown_getset_def = {
+    (char *)"thisown", SwigPyBuiltin_GetterClosure, SwigPyBuiltin_SetterClosure, NULL, &thisown_getset_closure
+  };
+  PyTypeObject *builtin_pytype;
+  int builtin_base_count;
+  swig_type_info *builtin_basetype;
+  PyObject *tuple;
+  PyGetSetDescrObject *static_getset;
+  PyTypeObject *metatype;
+  PyTypeObject *swigpyobject;
+  SwigPyClientData *cd;
+  PyObject *public_interface, *public_symbol;
+  PyObject *this_descr;
+  PyObject *thisown_descr;
+  PyObject *self = 0;
+  int i;
+  
+  (void)builtin_pytype;
+  (void)builtin_base_count;
+  (void)builtin_basetype;
+  (void)tuple;
+  (void)static_getset;
+  (void)self;
+  
+  /* Metaclass is used to implement static member variables */
+  metatype = SwigPyObjectType();
+  assert(metatype);
+#endif
+  
+  /* Fix SwigMethods to carry the callback ptrs when needed */
+  SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_type_initial);
+  
+#if PY_VERSION_HEX >= 0x03000000
+  m = PyModule_Create(&SWIG_module);
+#else
+  m = Py_InitModule((char *) SWIG_name, SwigMethods);
+#endif
+  
+  md = d = PyModule_GetDict(m);
+  (void)md;
+  
+  SWIG_InitializeModule(0);
+  
+#ifdef SWIGPYTHON_BUILTIN
+  swigpyobject = SwigPyObject_TypeOnce();
+  
+  SwigPyObject_stype = SWIG_MangledTypeQuery("_p_SwigPyObject");
+  assert(SwigPyObject_stype);
+  cd = (SwigPyClientData*) SwigPyObject_stype->clientdata;
+  if (!cd) {
+    SwigPyObject_stype->clientdata = &SwigPyObject_clientdata;
+    SwigPyObject_clientdata.pytype = swigpyobject;
+  } else if (swigpyobject->tp_basicsize != cd->pytype->tp_basicsize) {
+    PyErr_SetString(PyExc_RuntimeError, "Import error: attempted to load two incompatible swig-generated modules.");
+# if PY_VERSION_HEX >= 0x03000000
+    return NULL;
+# else
+    return;
+# endif
+  }
+  
+  /* All objects have a 'this' attribute */
+  this_descr = PyDescr_NewGetSet(SwigPyObject_type(), &this_getset_def);
+  (void)this_descr;
+  
+  /* All objects have a 'thisown' attribute */
+  thisown_descr = PyDescr_NewGetSet(SwigPyObject_type(), &thisown_getset_def);
+  (void)thisown_descr;
+  
+  public_interface = PyList_New(0);
+  public_symbol = 0;
+  (void)public_symbol;
+  
+  PyDict_SetItemString(md, "__all__", public_interface);
+  Py_DECREF(public_interface);
+  for (i = 0; SwigMethods[i].ml_name != NULL; ++i)
+  SwigPyBuiltin_AddPublicSymbol(public_interface, SwigMethods[i].ml_name);
+  for (i = 0; swig_const_table[i].name != 0; ++i)
+  SwigPyBuiltin_AddPublicSymbol(public_interface, swig_const_table[i].name);
+#endif
+  
+  SWIG_InstallConstants(d,swig_const_table);
+  
+  
+  Py_Initialize();
+  import_array();
+  
+#if PY_VERSION_HEX >= 0x03000000
+  return m;
+#else
+  return;
+#endif
+}
+
diff --git a/pymolfile/molfile/pymolfile.cxx b/pymolfile/molfile/pymolfile.cxx
new file mode 100644
index 0000000..51eda58
--- /dev/null
+++ b/pymolfile/molfile/pymolfile.cxx
@@ -0,0 +1,740 @@
+/* Hey emacs this is -*- C -*- and this is my editor vim.
+ * 
+ * pymolfile.c : C and Python interfaces for molfile_plugins
+ * Copyright (c) Berk Onat <b.onat@warwick.ac.uk> 2017
+ *
+ * This program is under UIUC Open Source License please see LICENSE file
+ */
+
+/*
+ * The code is written following the plugin test 
+ * context of main.c in molfile_plugin/src/ 
+ */
+
+/* Get HAVE_CONFIG_H */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdbool.h>
+#include <ctype.h>
+
+/* get fixed-width types if we are using ANSI C99 */
+#ifdef HAVE_STDINT_H
+#  include <stdint.h>
+#elif (defined HAVE_INTTYPES_H)
+#  include <inttypes.h>
+#endif
+
+#include "pymolfile.h"
+
+int numplugins=0;
+molfile_plugin_t** plugin_list;
+
+#if PY_VERSION_HEX >= 0x03000000
+#define PyInt_AsLong PyLong_AsLong
+#define PyString_FromString PyBytes_FromString
+#define PyInt_FromLong PyLong_FromLong
+
+void del_molfile_plugin_list(PyObject* molcapsule)
+{
+    plugin_list = (molfile_plugin_t**) PyMolfileCapsule_AsVoidPtr(molcapsule);   
+    free(plugin_list); 
+    Py_XDECREF(molcapsule);
+}
+void del_molfile_file_handle(PyObject* molcapsule)
+{
+    void *file_handle = (void*) PyMolfileCapsule_AsVoidPtr(molcapsule);   
+    free(file_handle); 
+    Py_XDECREF(molcapsule);
+}
+#else
+void del_molfile_plugin_list(void* molcapsule)
+{
+    plugin_list = (molfile_plugin_t**) PyMolfileCapsule_AsVoidPtr((PyObject*)molcapsule);   
+    free(plugin_list); 
+    Py_XDECREF(molcapsule);
+}
+void del_molfile_file_handle(void* molcapsule)
+{
+    void *file_handle = PyMolfileCapsule_AsVoidPtr((PyObject*)molcapsule);   
+    free(file_handle); 
+    Py_XDECREF(molcapsule);
+}
+#endif
+
+/* * * * * * * * * * * * * * * * * * * * * * *
+ * Helper functions to set and store plugins *
+ * * * * * * * * * * * * * * * * * * * * * * */
+
+PyObject* get_plugin(PyObject* molcapsule, int plug_no)
+{
+    molfile_plugin_t* plugin;
+    molfile_plugin_t** plug_list = (molfile_plugin_t**) PyMolfileCapsule_AsVoidPtr(molcapsule);   
+    if(plug_no < 0){
+	plugin = NULL;
+    } else {
+	if(plug_list != NULL){
+	    plugin = plug_list[plug_no];
+	} else {
+	    plugin = NULL;
+	}
+    }
+    return (PyObject*) PyMolfileCapsule_FromVoidPtr((void *)plugin, NULL);
+}
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Interface functions to initialize molfile plugins *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* check validity of plugins and register them. */
+static int molfile_register(void*, vmdplugin_t *plugin) {
+    if (!plugin->type || !plugin->name || !plugin->author) {
+        // skipping plugin with incomplete header
+        return VMDPLUGIN_ERROR;
+    }
+    else if (plugin->abiversion != vmdplugin_ABIVERSION) {
+        // skipping plugin with incompatible ABI
+        return VMDPLUGIN_ERROR;
+    }
+    else if (0 != strncmp(plugin->type, "mol file", 8)) {
+        // skipping plugin of incompatible type
+        return VMDPLUGIN_ERROR;
+    } 
+    else if (numplugins >= MAXPLUGINS) {
+        // too many plugins: increase MAXPLUGINS
+        return VMDPLUGIN_ERROR;
+    }
+
+        plugin_list[numplugins] = (molfile_plugin_t *) plugin;
+        ++numplugins;
+        return VMDPLUGIN_SUCCESS;
+}
+
+PyObject* molfile_plugin_list(int maxsize)
+{
+    if(maxsize < MAXPLUGINS){
+        maxsize = MAXPLUGINS;
+    }
+    plugin_list = (molfile_plugin_t**) malloc(sizeof(molfile_plugin_t*)*maxsize);
+    return PyMolfileCapsule_FromVoidPtr((void *)plugin_list, del_molfile_plugin_list);
+}
+
+/* register all available plugins and clear handles. */
+int molfile_init(void) 
+{
+    MOLFILE_INIT_ALL;
+    MOLFILE_REGISTER_ALL(NULL,molfile_register);
+    return numplugins;
+}
+
+/* unregister all available plugins */
+int molfile_finish(void) 
+{
+    MOLFILE_FINI_ALL;
+    return 0;
+}
+
+/* * * * * * * * * * * * * * * * * * * * * * *
+ * Wrappers to directly access molfile plugin*
+ *         functions and settings            *
+ * * * * * * * * * * * * * * * * * * * * * * */
+
+/* molfile_plugin_t access */
+
+/* Functions in molfile_plugin_t */
+
+PyObject * molfile_plugin_info(PyObject* molcapsule, int plugin_no) {
+    molfile_plugin_t *plugin;
+    molfile_plugin_t** plugin_list = (molfile_plugin_t**) PyMolfileCapsule_AsVoidPtr(molcapsule);   
+    int *plugno = &plugin_no;
+    int has_readstructure = 0;
+    int has_readbonds = 0;
+    int has_readangles = 0;
+    int has_writestructure = 0;
+    int has_writebonds = 0;
+    int has_writeangles = 0;
+    int has_readnexttimestep = 0;
+    int has_writetimestep = 0;
+    int plugin_list_size = sizeof(plugin_list) / sizeof(molfile_plugin_t**);
+    if (plugno==NULL || plugin_no<0){
+      PyErr_Format(PyExc_IOError, "Error: molfile plugin handle no should be given, be positive value and should not exceed the list length'%d'. You set '%d'", plugin_list_size, plugin_no);
+      return 0;
+    }
+    plugin = plugin_list[plugin_no];
+    if(plugin==NULL || !plugin->open_file_read){
+      PyErr_Format(PyExc_IOError, "Error: molfile plugin '%d' is not initialized.", plugin_no);
+      return 0;
+    }
+    if (plugin->read_structure) has_readstructure = 1;
+    if (plugin->read_bonds) has_readbonds = 1;
+    if (plugin->read_angles) has_readangles = 1;
+    if (plugin->read_next_timestep) has_readnexttimestep = 1;
+    if (plugin->write_structure) has_writestructure = 1;
+    if (plugin->write_bonds) has_writebonds = 1;
+    if (plugin->write_angles) has_writeangles = 1;
+    if (plugin->write_timestep) has_writetimestep = 1;
+    PyObject *tuple = PyTuple_New(17);
+    PyTuple_SET_ITEM(tuple, 0, PyString_FromString(plugin->filename_extension));
+    PyTuple_SET_ITEM(tuple, 1, PyString_FromString(plugin->name));
+    PyTuple_SET_ITEM(tuple, 2, PyInt_FromLong((long)has_readstructure));
+    PyTuple_SET_ITEM(tuple, 3, PyInt_FromLong((long)has_readbonds));
+    PyTuple_SET_ITEM(tuple, 4, PyInt_FromLong((long)has_readangles));
+    PyTuple_SET_ITEM(tuple, 5, PyInt_FromLong((long)has_readnexttimestep));
+    PyTuple_SET_ITEM(tuple, 6, PyInt_FromLong((long)has_writestructure));
+    PyTuple_SET_ITEM(tuple, 7, PyInt_FromLong((long)has_writebonds));
+    PyTuple_SET_ITEM(tuple, 8, PyInt_FromLong((long)has_writeangles));
+    PyTuple_SET_ITEM(tuple, 9, PyInt_FromLong((long)has_writetimestep));
+    PyTuple_SET_ITEM(tuple, 10, PyString_FromString(plugin->prettyname));
+    PyTuple_SET_ITEM(tuple, 11, PyString_FromString(plugin->type));
+    PyTuple_SET_ITEM(tuple, 12, PyString_FromString(plugin->author));
+    PyTuple_SET_ITEM(tuple, 13, PyInt_FromLong((long)plugin->majorv));
+    PyTuple_SET_ITEM(tuple, 14, PyInt_FromLong((long)plugin->minorv));
+    PyTuple_SET_ITEM(tuple, 15, PyInt_FromLong((long)plugin->abiversion));
+    PyTuple_SET_ITEM(tuple, 16, PyInt_FromLong((long)plugin->is_reentrant));
+    return tuple;
+}
+
+PyObject* read_fill_structure(PyObject* molpack, PyObject* prototype)
+{
+    //Py_Initialize();
+    //import_array();
+    int options = 0;
+    molfile_plugin_t* plugin;
+    void* file_handle;
+    molfile_atom_t* data;
+    int numatoms, status;
+    int nd;
+    PyObject *ret = NULL;
+    // Access plugin_handle values
+    MolObject* plugin_handle = (MolObject*) molpack;
+    if (plugin_handle->plugin) {
+        plugin = (molfile_plugin_t*) PyMolfileCapsule_AsVoidPtr(plugin_handle->plugin);
+        //plugin = plugin_handle->plugin;   
+    } else {
+        PyErr_Format(PyExc_IOError, "molfile plugin is not active.");
+	return NULL;
+    } 
+    if (plugin_handle->file_handle) {
+        file_handle = (void*) PyMolfileCapsule_AsVoidPtr(plugin_handle->file_handle);
+        //file_handle = plugin_handle->file_handle;
+    } else {
+        PyErr_Format(PyExc_IOError, "no file handle in molfile plugin handle.");
+	return NULL; 
+    } 
+    if (plugin_handle->natoms) {
+        numatoms = plugin_handle->natoms;
+    } else { 
+        PyErr_Format(PyExc_IOError, "no assigned number of atoms in molfile plugin handle.");
+	return NULL;
+    } 
+    // Allocate memory for array of molfile_atom_t struct
+    data = (molfile_atom_t *)calloc(numatoms,sizeof(molfile_atom_t));
+    // Get array values in molfile_atom_t
+    if (plugin->read_structure) {
+        status = plugin->read_structure(file_handle, &options, data);
+        // Check if the plugin returns the results
+        if (status!=0){
+            PyErr_Format(PyExc_IOError, "Error accessing molfile_atom_t in read_structure function of plugin.");
+            return NULL;
+        }
+	if(numatoms>0){
+            nd = 1;
+            npy_intp dims[1] = { numatoms };
+            npy_intp strides[1] = { sizeof(molfile_atom_t) };
+            Py_INCREF(prototype);
+            ret = PyArray_NewFromDescr(Py_TYPE(prototype), PyArray_DESCR((PyArrayObject*)prototype), 
+	       	                       nd, dims,
+		                       strides, data, 
+			               PyArray_FLAGS((PyArrayObject*)prototype), prototype);
+            Py_DECREF(prototype);
+            return (PyObject*) ret;
+	} else {
+            PyErr_Format(PyExc_AttributeError, "plugin read_structure does not have atoms information.");
+	    Py_RETURN_NONE;
+	}
+    } else {
+        PyErr_Format(PyExc_AttributeError, "molfile plugin does not have read_structure function.");
+	Py_RETURN_NONE;
+    }
+}
+
+PyObject* read_fill_bonds(PyObject* molpack)
+{
+    import_array();
+    int options = 0;
+    molfile_plugin_t* plugin;
+    void* file_handle;
+    molfile_atom_t* data;
+    int numatoms, status;
+    int nd;
+    PyObject *ret = NULL;
+    // Access plugin_handle values
+    MolObject* plugin_handle = (MolObject*) molpack;
+    if (plugin_handle->plugin) {
+        plugin = (molfile_plugin_t*) PyMolfileCapsule_AsVoidPtr(plugin_handle->plugin);
+        //plugin = plugin_handle->plugin;   
+    } else {
+        PyErr_Format(PyExc_IOError, "molfile plugin is not active.");
+	return NULL;
+    } 
+    if (plugin_handle->file_handle) {
+        file_handle = (void*) PyMolfileCapsule_AsVoidPtr(plugin_handle->file_handle);
+        //file_handle = plugin_handle->file_handle;
+    } else {
+        PyErr_Format(PyExc_IOError, "no file handle in molfile plugin handle.");
+	return NULL; 
+    } 
+    numatoms = plugin_handle->natoms;
+    if (plugin->read_bonds) {
+        int nbonds, *from, *to, *bondtype, nbondtypes;
+        float *bondorder;
+        char **bondtypename;
+        if ((status = plugin->read_bonds(file_handle, &nbonds, &from, &to, 
+				         &bondorder, &bondtype, &nbondtypes, &bondtypename))) {
+            PyErr_Format(PyExc_IOError, "Error accessing read_bonds function of plugin.");
+            return NULL;
+        }
+        PyArrayInterface *inter = NULL;
+        inter = (PyArrayInterface*)malloc(sizeof(PyArrayInterface));
+        if (inter==NULL)
+            return PyErr_NoMemory();
+        inter->flags = NPY_ARRAY_NOTSWAPPED | NPY_ARRAY_ALIGNED | NPY_ARRAY_WRITEABLE;
+	ret = PyDict_New();
+        nd = 1;
+        npy_intp istrides[1] = { NPY_SIZEOF_INT };
+        npy_intp fstrides[1] = { NPY_SIZEOF_FLOAT };
+        npy_intp cstrides[1] = { sizeof(NPY_STRING) };
+	if (nbonds>0) {
+            PyObject *from_arr = NULL;
+            PyObject *to_arr = NULL;
+            npy_intp dims[1] = { nbonds };
+            from_arr = PyArray_NewFromDescr(&PyArray_Type, PyArray_DescrFromType(NPY_INT), 
+                                            nd, dims,
+                                            istrides, from, 
+                                            inter->flags, NULL);
+	    PyDict_SetItemString(ret, "from", from_arr);
+            to_arr = PyArray_NewFromDescr(&PyArray_Type, PyArray_DescrFromType(NPY_INT), 
+                                          nd, dims,
+                                          istrides, to, 
+                                          inter->flags, NULL);
+	    PyDict_SetItemString(ret, "to", to_arr);
+	    if (bondorder!=NULL) {
+                PyObject *bondorder_arr = NULL;
+                bondorder_arr = PyArray_NewFromDescr(&PyArray_Type, PyArray_DescrFromType(NPY_FLOAT), 
+                                                     nd, dims,
+                                                     fstrides, bondorder, 
+			                             inter->flags, NULL);
+	        PyDict_SetItemString(ret, "bondorder", bondorder_arr);
+	    }
+	    if (bondtype!=NULL && nbondtypes>0) {
+                PyObject *bondtype_arr = NULL;
+                bondtype_arr = PyArray_NewFromDescr(&PyArray_Type, PyArray_DescrFromType(NPY_INT), 
+                                                    nd, dims,
+                                                    istrides, bondtype, 
+			                            inter->flags, NULL);
+	        PyDict_SetItemString(ret, "bondtype", bondtype_arr);
+	    }
+	    if (bondtypename!=NULL && nbondtypes>0) {
+                PyObject *bondtypename_arr = NULL;
+                npy_intp cdims[1] = { nbondtypes };
+                bondtypename_arr = PyArray_NewFromDescr(&PyArray_Type, PyArray_DescrFromType(NPY_STRING), 
+                                                        nd, cdims,
+                                                        cstrides, bondtypename, 
+	                                                inter->flags, NULL);
+	        PyDict_SetItemString(ret, "bondtypename", bondtypename_arr);
+	    }
+            return (PyObject*) ret;
+	} else {
+            Py_RETURN_NONE;
+	}
+    } else {
+        PyErr_Format(PyExc_AttributeError, "molfile plugin does not have read_bonds function.");
+        Py_RETURN_NONE;
+    }
+}
+
+PyObject* read_fill_angles(PyObject* molpack)
+{
+    import_array();
+    int options = 0;
+    molfile_plugin_t* plugin;
+    void* file_handle;
+    molfile_atom_t* data;
+    int numatoms, status;
+    int nd;
+    int nodata = 0;
+    PyObject *ret = NULL;
+    // Access plugin_handle values
+    MolObject* plugin_handle = (MolObject*) molpack;
+    if (plugin_handle->plugin) {
+        plugin = (molfile_plugin_t*) PyMolfileCapsule_AsVoidPtr(plugin_handle->plugin);
+        //plugin = plugin_handle->plugin;   
+    } else {
+        PyErr_Format(PyExc_IOError, "molfile plugin is not active.");
+	return NULL;
+    } 
+    if (plugin_handle->file_handle) {
+        file_handle = (void*) PyMolfileCapsule_AsVoidPtr(plugin_handle->file_handle);
+        //file_handle = plugin_handle->file_handle;
+    } else {
+        PyErr_Format(PyExc_IOError, "no file handle in molfile plugin handle.");
+	return NULL; 
+    } 
+    numatoms = plugin_handle->natoms;
+    // Check if there is read_angles support in this plugin
+    if (plugin->read_angles) {
+	// Angles
+        int numangles;
+        int *angles = NULL;
+	int *angletypes = NULL;
+        int numangletypes;
+	char **angletypenames = NULL; 
+	// Dihedrals
+	int numdihedrals; 
+	int *dihedrals = NULL;
+	int *dihedraltypes = NULL;
+	int numdihedraltypes;
+        char **dihedraltypenames = NULL; 
+	// Impropers
+	int numimpropers;
+        int *impropers = NULL;
+        int *impropertypes = NULL;
+	int numimpropertypes;
+	char **impropertypenames = NULL;
+	// Cterms
+        int numcterms, ctermcols, ctermrows;
+	int *cterms = NULL; 
+	// Initilize zeros to number of angles, dihedrals, so on ...
+	numangles = 0;
+	numangletypes = 0;
+	numdihedrals = 0;
+	numdihedraltypes = 0;
+	numimpropers = 0;
+	numimpropertypes = 0;
+	numcterms = 0;
+	// Calling read_angles to gather the information
+        if ((status = plugin->read_angles(file_handle, &numangles, &angles, &angletypes,
+                                          &numangletypes, &angletypenames, &numdihedrals,
+                                          &dihedrals, &dihedraltypes, &numdihedraltypes,
+                                          &dihedraltypenames, &numimpropers, &impropers,        
+                                          &impropertypes, &numimpropertypes, &impropertypenames,
+                                          &numcterms, &cterms, &ctermcols, &ctermrows))) {
+            PyErr_Format(PyExc_IOError, "Error accessing read_angles function of plugin.");
+            return NULL;
+        }
+        PyArrayInterface *inter = NULL;
+        inter = (PyArrayInterface*)malloc(sizeof(PyArrayInterface));
+        if (inter==NULL)
+            return PyErr_NoMemory();
+        inter->flags = NPY_ARRAY_NOTSWAPPED | NPY_ARRAY_ALIGNED | NPY_ARRAY_WRITEABLE;
+	ret = PyDict_New();
+        nd = 1;
+        npy_intp istrides[1] = { NPY_SIZEOF_INT };
+        npy_intp sstrides[1] = { sizeof(NPY_STRING) };
+	if (numangles>0 && angles!=NULL) {
+	    nodata = 1;
+            PyObject *angles_arr = NULL;
+            npy_intp adims[1] = { numangles };
+            angles_arr = PyArray_NewFromDescr(&PyArray_Type, PyArray_DescrFromType(NPY_INT), 
+                                              nd, adims,
+                                              istrides, angles, 
+                                              inter->flags, NULL);
+	    PyDict_SetItemString(ret, "angles", angles_arr);
+	    if (angletypes!=NULL) {
+                PyObject *angletypes_arr = NULL;
+                angletypes_arr = PyArray_NewFromDescr(&PyArray_Type, PyArray_DescrFromType(NPY_INT), 
+                                                      nd, adims,
+                                                      istrides, angletypes, 
+                                                      inter->flags, NULL);
+	        PyDict_SetItemString(ret, "angletypes", angletypes_arr);
+	    }
+	}
+	if (numangletypes>0 && angletypenames!=NULL) {
+	    nodata = 1;
+            PyObject *angletypenames_arr = NULL;
+            npy_intp atdims[1] = { numangletypes };
+            angletypenames_arr = PyArray_NewFromDescr(&PyArray_Type, PyArray_DescrFromType(NPY_STRING), 
+                                                      nd, atdims,
+                                                      sstrides, angletypenames, 
+			                              inter->flags, NULL);
+	    PyDict_SetItemString(ret, "angletypenames", angletypenames_arr);
+	}
+	if (numdihedrals>0 && dihedrals!=NULL) {
+	    nodata = 1;
+            PyObject *dihedrals_arr = NULL;
+            npy_intp ddims[1] = { numdihedrals };
+            dihedrals_arr = PyArray_NewFromDescr(&PyArray_Type, PyArray_DescrFromType(NPY_INT), 
+                                                 nd, ddims,
+                                                 istrides, dihedrals, 
+			                         inter->flags, NULL);
+	    PyDict_SetItemString(ret, "dihedrals", dihedrals_arr);
+	    if (dihedraltypes!=NULL) {
+                PyObject *dihedraltypes_arr = NULL;
+                dihedraltypes_arr = PyArray_NewFromDescr(&PyArray_Type, PyArray_DescrFromType(NPY_INT), 
+                                                    nd, ddims,
+                                                    istrides, dihedraltypes, 
+                                                    inter->flags, NULL);
+	        PyDict_SetItemString(ret, "dihedraltypes", dihedraltypes_arr);
+	    }
+	}
+	if (numdihedraltypes>0 && dihedraltypenames!=NULL) {
+            PyObject *dihedraltypenames_arr = NULL;
+            npy_intp dtdims[1] = { numdihedraltypes };
+            dihedraltypenames_arr = PyArray_NewFromDescr(&PyArray_Type, PyArray_DescrFromType(NPY_STRING), 
+                                                         nd, dtdims,
+                                                         sstrides, dihedraltypenames, 
+	                                                 inter->flags, NULL);
+	    PyDict_SetItemString(ret, "dihedraltypenames", dihedraltypenames_arr);
+	}
+	if (numimpropers>0 && impropers!=NULL) {
+	    nodata = 1;
+            PyObject *impropers_arr = NULL;
+            npy_intp idims[1] = { numimpropers };
+            impropers_arr = PyArray_NewFromDescr(&PyArray_Type, PyArray_DescrFromType(NPY_INT), 
+                                                 nd, idims,
+                                                 istrides, impropers, 
+			                         inter->flags, NULL);
+	    PyDict_SetItemString(ret, "impropers", impropers_arr);
+	    if (impropertypes!=NULL) {
+                PyObject *impropertypes_arr = NULL;
+                impropertypes_arr = PyArray_NewFromDescr(&PyArray_Type, PyArray_DescrFromType(NPY_INT), 
+                                                         nd, idims,
+                                                         istrides, impropertypes, 
+                                                         inter->flags, NULL);
+	        PyDict_SetItemString(ret, "impropertypes", impropertypes_arr);
+	    }
+	}
+	if (numimpropertypes>0 && impropertypenames!=NULL) {
+            PyObject *impropertypenames_arr = NULL;
+            npy_intp itdims[1] = { numimpropertypes };
+            impropertypenames_arr = PyArray_NewFromDescr(&PyArray_Type, PyArray_DescrFromType(NPY_STRING), 
+                                                         nd, itdims,
+                                                         sstrides, impropertypenames, 
+	                                                 inter->flags, NULL);
+	    PyDict_SetItemString(ret, "impropertypenames", impropertypenames_arr);
+	}
+	if (numcterms>0 && cterms!=NULL) {
+	    nodata = 1;
+	    int ctermnd;
+            npy_intp *ctermdims;
+	    npy_intp *ctermstrides;
+            PyObject *cterms_arr = NULL;
+	    if (ctermrows>0 || ctermcols>0) {
+		ctermnd = 2;
+                ctermdims = (npy_intp*)calloc(ctermnd,sizeof(int));
+                ctermstrides = (npy_intp*)calloc(ctermnd,sizeof(int));
+	        ctermdims[0] = ctermrows;
+	        ctermdims[1] = ctermcols;
+	        ctermstrides[0] = NPY_SIZEOF_INT;
+	        ctermstrides[1] = ctermcols*NPY_SIZEOF_INT;
+	    } else {
+		ctermnd = 1;
+                ctermdims = (npy_intp*)calloc(ctermnd,sizeof(int));
+                ctermstrides = (npy_intp*)calloc(ctermnd,sizeof(int));
+	        ctermdims[0] = 8*numcterms;
+	        ctermstrides[0] = NPY_SIZEOF_INT;
+	    }
+            cterms_arr = PyArray_NewFromDescr(&PyArray_Type, PyArray_DescrFromType(NPY_INT), 
+                                              ctermnd, ctermdims,
+                                              ctermstrides, cterms, 
+			                      inter->flags, NULL);
+	    PyDict_SetItemString(ret, "cterms", cterms_arr);
+	}
+	if (nodata>0) {
+            return (PyObject*) ret;
+	} else {
+            Py_RETURN_NONE;
+	}
+    } else {
+        PyErr_Format(PyExc_AttributeError, "molfile plugin does not have read_angles function.");
+        Py_RETURN_NONE;
+    }
+}
+
+
+PyObject* read_fill_next_timestep(PyObject* molpack)
+{
+    import_array();
+    molfile_plugin_t* plugin;
+    void* file_handle;
+    int numatoms, status;
+    int nd;
+    int i, d;
+    PyObject *ret = NULL;
+    // Access plugin_handle values
+    MolObject* plugin_handle = (MolObject*) molpack;
+    if (plugin_handle->plugin) {
+        plugin = (molfile_plugin_t*) PyMolfileCapsule_AsVoidPtr(plugin_handle->plugin);
+        //plugin = plugin_handle->plugin;   
+    } else {
+        PyErr_Format(PyExc_IOError, "molfile plugin is not active.");
+	return NULL;
+    } 
+    if (plugin_handle->file_handle) {
+        file_handle = (void*) PyMolfileCapsule_AsVoidPtr(plugin_handle->file_handle);
+        //file_handle = plugin_handle->file_handle;
+    } else {
+        PyErr_Format(PyExc_IOError, "no file handle in molfile plugin handle.");
+	return NULL; 
+    } 
+    if (plugin_handle->natoms) {
+        numatoms = plugin_handle->natoms;
+    } else { 
+        PyErr_Format(PyExc_IOError, "no assigned number of atoms in molfile plugin handle.");
+	return NULL;
+    }
+    if (plugin->read_next_timestep) {
+        PyArrayInterface *inter = NULL;
+        inter = (PyArrayInterface*)malloc(sizeof(PyArrayInterface));
+        if (inter==NULL)
+            return PyErr_NoMemory();
+        inter->flags = NPY_ARRAY_NOTSWAPPED | NPY_ARRAY_ALIGNED | NPY_ARRAY_WRITEABLE;
+	ret = PyDict_New();
+        molfile_timestep_t timestep;
+	// Check if the velocities will be supplied from this plugin
+	int has_velocities = -1;
+	unsigned int total_steps = 0;
+	unsigned int bytes_per_step = 0;
+	molfile_timestep_metadata_t timestep_metadata;
+        if (plugin->read_timestep_metadata) {
+	    plugin->read_timestep_metadata(file_handle, &timestep_metadata);
+            total_steps = timestep_metadata.count; 
+	    has_velocities = timestep_metadata.has_velocities;
+	    bytes_per_step = timestep_metadata.avg_bytes_per_timestep;
+	} else {
+	    total_steps = 0;
+	    has_velocities = -2;
+	}
+	timestep.A=-1;
+	timestep.B=-1;
+	timestep.C=-1;
+	timestep.alpha=-1;
+	timestep.beta=-1;
+	timestep.gamma=-1;
+	timestep.physical_time=-1;
+        timestep.coords = (float *)malloc(3*numatoms*sizeof(float));
+	if(has_velocities == -2 || has_velocities == 1) { 
+            timestep.velocities = (float *)malloc(3*numatoms*sizeof(float));
+	    for(i=0;i<numatoms;i++)
+	        for(d=0;d<3;d++)
+	            timestep.velocities[i*3+d] = -1111*(d+1);
+	}
+        status = plugin->read_next_timestep(file_handle, numatoms, &timestep);
+        if (status == MOLFILE_EOF) {
+	    Py_RETURN_NONE;
+	}
+	else if (status != MOLFILE_SUCCESS) {
+            PyErr_Format(PyExc_AttributeError, "Failed in calling read_next_timestep function of plugin.");
+	    Py_RETURN_NONE;
+        } 
+	else {
+            nd = 2;
+            PyObject *coords_arr = NULL;
+            npy_intp dims[2] = { numatoms, 3 };
+            npy_intp strides[2] = { 3*sizeof(float), sizeof(float) };
+            coords_arr = PyArray_NewFromDescr(&PyArray_Type, PyArray_DescrFromType(NPY_FLOAT), 
+                                              nd, dims,
+                                              strides, timestep.coords, 
+	                                      inter->flags, NULL);
+	    PyDict_SetItemString(ret, "coords", coords_arr);
+	    if (timestep.velocities!=NULL && (has_velocities == -2 || has_velocities == 1)) {
+		if (-1111 != (int)timestep.velocities[0] && 
+		    -2222 != (int)timestep.velocities[1] && 
+		    -3333 != (int)timestep.velocities[2]) {
+                    PyObject *velocities_arr = NULL;
+                    velocities_arr = PyArray_NewFromDescr(&PyArray_Type, PyArray_DescrFromType(NPY_FLOAT), 
+                                                          nd, dims,
+                                                          strides, timestep.velocities, 
+	                                                  inter->flags, NULL);
+	            PyDict_SetItemString(ret, "velocities", velocities_arr);
+		}
+	    } else {
+		if(has_velocities == -2 || has_velocities == 1)
+		    free(timestep.velocities);
+	    }
+            if(timestep.A > -1)
+	        PyDict_SetItemString(ret, "A", PyFloat_FromDouble((double)timestep.A));
+            if(timestep.B > -1)
+	        PyDict_SetItemString(ret, "B", PyFloat_FromDouble((double)timestep.B));
+            if(timestep.C > -1)
+	        PyDict_SetItemString(ret, "C", PyFloat_FromDouble((double)timestep.C));
+            if(timestep.alpha > -1)
+	        PyDict_SetItemString(ret, "alpha", PyFloat_FromDouble((double)timestep.alpha));
+	    if(timestep.beta > -1)
+	        PyDict_SetItemString(ret, "beta", PyFloat_FromDouble((double)timestep.beta));
+	    if(timestep.gamma > -1)
+	        PyDict_SetItemString(ret, "gamma", PyFloat_FromDouble((double)timestep.gamma));
+	    if(timestep.physical_time > -1)
+	        PyDict_SetItemString(ret, "physical_time", PyFloat_FromDouble(timestep.physical_time));
+	    //if(has_velocities > -1)
+	    //    PyDict_SetItemString(ret, "has_velocities", PyLong_FromLong((long)has_velocities));
+	    if(total_steps > -1)
+	        PyDict_SetItemString(ret, "total_steps", PyLong_FromLong((long)total_steps));
+	    PyDict_SetItemString(ret, "has_velocities", PyLong_FromLong((long)has_velocities));
+            return (PyObject*) ret;
+	}
+    } else {
+        PyErr_Format(PyExc_AttributeError, "molfile plugin does not have read_next_timestep function.");
+	Py_RETURN_NONE;
+    }
+}
+
+PyObject* are_plugins_same(PyObject* molpack_a, PyObject* molpack_b)
+{
+    molfile_plugin_t* plugin_a;
+    molfile_plugin_t* plugin_b;
+    PyObject *ret = NULL;
+    MolObject* plugin_handle_a = (MolObject*) molpack_a;
+    MolObject* plugin_handle_b = (MolObject*) molpack_b;
+    if (plugin_handle_a->plugin) {
+        plugin_a = (molfile_plugin_t*) PyMolfileCapsule_AsVoidPtr(plugin_handle_a->plugin);
+        //plugin_a = plugin_handle_a->plugin;   
+    } else {
+        PyErr_Format(PyExc_IOError, "Arg 1 of the molfile plugin is not active.");
+	return NULL;
+    } 
+    if (plugin_handle_b->plugin) {
+        plugin_b = (molfile_plugin_t*) PyMolfileCapsule_AsVoidPtr(plugin_handle_b->plugin);
+        //plugin_b = plugin_handle_b->plugin;   
+    } else {
+        PyErr_Format(PyExc_IOError, "Arg 2 of the molfile plugin is not active.");
+	return NULL; 
+    } 
+    if(plugin_a == plugin_b){
+      Py_RETURN_TRUE;
+    } else {
+      Py_RETURN_FALSE;
+    }
+}
+
+PyObject* are_filehandles_same(PyObject* molpack_a, PyObject* molpack_b)
+{
+    MolObject* plugin_handle_a = (MolObject*) molpack_a;
+    MolObject* plugin_handle_b = (MolObject*) molpack_b;
+    void* file_handle_a; 
+    void* file_handle_b; 
+    if (plugin_handle_a->file_handle) {
+        file_handle_a = (void*) PyMolfileCapsule_AsVoidPtr(plugin_handle_a->file_handle);
+        //file_handle_a = plugin_handle_a->file_handle;   
+    } else {
+        PyErr_Format(PyExc_IOError, "no file handle in arg 1 of molfile plugin.");
+	return NULL;
+    } 
+    if (plugin_handle_b->file_handle) {
+        file_handle_b = (void*) PyMolfileCapsule_AsVoidPtr(plugin_handle_b->file_handle);
+        //file_handle_b = plugin_handle_b->file_handle;   
+    } else {
+        PyErr_Format(PyExc_IOError, "no file handle in arg 2 of molfile plugin.");
+	return NULL;
+    } 
+    if(file_handle_a == file_handle_b){
+      Py_RETURN_TRUE;
+    } else {
+      Py_RETURN_FALSE;
+    }
+}
+
diff --git a/pymolfile/molfile/pymolfile.h b/pymolfile/molfile/pymolfile.h
index a9fdd15..97019a9 100644
--- a/pymolfile/molfile/pymolfile.h
+++ b/pymolfile/molfile/pymolfile.h
@@ -52,10 +52,6 @@ struct MolObject {
 };
 */
 
-static void * PyMolfileCapsule_AsVoidPtr(PyObject *obj);
-static PyObject * PyMolfileCapsule_FromVoidPtr(void *ptr, void (*data)(PyObject *));
-void del_molfile_plugin_list(PyObject* molcapsule);
-void del_molfile_file_handle(PyObject* molcapsule);
 
 #if PY_VERSION_HEX >= 0x03000000
 #define PyInt_AsSsize_t PyLong_AsSsize_t
@@ -69,6 +65,11 @@ void del_molfile_file_handle(PyObject* molcapsule);
 #define PyString_Type PyBytes_Type
 #define PyInt_Type PyLong_Type
 
+void del_molfile_plugin_list(PyObject* molcapsule);
+void del_molfile_file_handle(PyObject* molcapsule);
+
+static void * PyMolfileCapsule_AsVoidPtr(PyObject *obj);
+
 static void * PyMolfileCapsule_AsVoidPtr(PyObject *obj)
 {
     void *ret = PyCapsule_GetPointer(obj, "plugin_handle");
@@ -78,6 +79,7 @@ static void * PyMolfileCapsule_AsVoidPtr(PyObject *obj)
     return ret;
 }
 
+static PyObject * PyMolfileCapsule_FromVoidPtr(void *ptr, void (*destr)(PyObject *));
 static PyObject * PyMolfileCapsule_FromVoidPtr(void *ptr, void (*destr)(PyObject *))
 {
     PyObject *ret = PyCapsule_New(ptr, "plugin_handle", destr);
@@ -90,11 +92,18 @@ static PyObject * PyMolfileCapsule_FromVoidPtr(void *ptr, void (*destr)(PyObject
 #else
 #define PyBytes_FromString PyString_FromString
 
+void del_molfile_plugin_list(void* molcapsule);
+void del_molfile_file_handle(void* molcapsule);
+
+static void * PyMolfileCapsule_AsVoidPtr(PyObject *obj);
+
 static void * PyMolfileCapsule_AsVoidPtr(PyObject *obj)
 {
     return PyCObject_AsVoidPtr(obj);
 }
 
+static PyObject * PyMolfileCapsule_FromVoidPtr(void *ptr, void (*destr)(void *));
+
 static PyObject * PyMolfileCapsule_FromVoidPtr(void *ptr, void (*destr)(void *))
 {
     return PyCObject_FromVoidPtr(ptr, destr);
diff --git a/setup.py b/setup.py
index e3fd83f..440b38d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,38 @@
 #!/usr/bin/env python
 
+import os
+import sysconfig
 import sys
 try:
     from setuptools.command.build_ext import build_ext
     from setuptools import setup, Extension, Command, find_packages
+    from Cython.Build import cythonize
+    from Cython.Distutils import build_ext
 except:
     from distutils.command.build_ext import build_ext
     from distutils import setup, Extension, Command, find_packages
+    from Cython.Build import cythonize
+    from Cython.Distutils import build_ext
 
+def get_ext_filename_without_platform_suffix(filename):
+    name, ext = os.path.splitext(filename)
+    ext_suffix = sysconfig.get_config_var('EXT_SUFFIX')
+
+    if ext_suffix == ext:
+        return filename
+
+    ext_suffix = ext_suffix.replace(ext, '')
+    idx = name.find(ext_suffix)
+
+    if idx == -1:
+        return filename
+    else:
+        return name[:idx] + ext
+
+class BuildExtWithoutPlatformSuffix(build_ext):
+    def get_ext_filename(self, ext_name):
+        filename = super().get_ext_filename(ext_name)
+        return get_ext_filename_without_platform_suffix(filename)
 
 VERSION = "0.0.1"
 CLASSIFIERS = [
@@ -96,36 +121,46 @@ largefile_macros = [
 ]
 
 if __name__ == '__main__':
+
     libpymolfile_module = Extension(
             'pymolfile/molfile/_libpymolfile', 
             sources=[
                 'pymolfile/molfile/libpymolfile.i' , 
-                'pymolfile/molfile/pymolfile.c'
+                'pymolfile/molfile/pymolfile.cxx'
                 ],
-            swig_opts=['-py3 -c++ -python'],
+            swig_opts=['-py3', '-Wall', '-c++'],
             library_dirs=[
-                '/usr/lib', 
-                'lib/'
+                'pymolfile/molfile/lib/',
+                'pymolfile/molfile/lib/tng/lib/'
                 ],
-            libraries=['libmolfile_plugin.a'],
+            libraries=['netcdf','tng_io','expat'],
             include_dirs = [
-                get_numpy_include, 
-                '/usr/include',
+                get_numpy_include(), 
                 'pymolfile/molfile',
                 'pymolfile/molfile/lib/'
                 'pymolfile/molfile/include/',
                 'pymolfile/molfile/include/molfile_plugin/include',
                 'pymolfile/molfile/lib/molfile_plugin/lib',
                 'pymolfile/molfile/include/plugin_src/include',
-                'pymolfile/molfile/include/netcdf/include',
-                'pymolfile/molfile/include/expat/include',
+                #'pymolfile/molfile/include/netcdf/include',
+                #'pymolfile/molfile/include/expat/include',
                 'pymolfile/molfile/include/tng/include',
                 ],
             extra_compile_args = [
-                '-DNDEBUG', '-DUNIX', '-D__UNIX',  '-m64', 
-                '-fPIC', '-O2', '-w', '-fmessage-length=0'
-                ]
+                '-fPIC', '-shared', '-O2', '-w'
+                #'-DNDEBUG', '-DUNIX', '-D__UNIX',  '-m64', 
+                #'-fPIC', '-O2', '-w', '-fmessage-length=0'
+                ],
+            extra_link_args = [
+                'pymolfile/molfile/lib/molfile_plugin/lib/libmolfile_plugin.a'
+                ],
+            define_macros = largefile_macros
             )
+    #if sys.version_info > (3,):
+    #    command_extension={'build_ext': BuildExtWithoutPlatformSuffix}
+    #else:
+    #    command_extension={}
+    command_extension={}
 
     setup(
         name = "pymolfile",
@@ -138,29 +173,10 @@ if __name__ == '__main__':
         url = "https://gitlab.mpcdf.mpg.de/berko/pymolfile",
         zip_safe = False,
         packages = find_packages(),
+        cmdclass= command_extension,
         ext_modules = [
             #libmolfile_plugin_compile(cmake_libmolfile_plugin_compile),
             libpymolfile_module,
-#            NumpyExtension(
-#                "pymolfile/molfile/_libpymolfile",
-#                "pymolfile"
-#                sources = [
-#                    "pymolfile/molfile/libpymolfile_wrap.cxx",
-#                    "pymolfile/molfile/pymolfile.c",
-#                    "pymolfile/molfile/lib/libmolfile_plugin.a",
-#                ],
-#                include_dirs = [ 
-#                    get_numpy_include, 
-#                    "pymolfile/molfile/include/",
-#                    "pymolfile/molfile/include/molfile_plugin/include",
-#                    "pymolfile/molfile/lib/molfile_plugin/lib",
-#                    "pymolfile/molfile/include/plugin_src/include",
-#                    "pymolfile/molfile/include/netcdf/include",
-#                    "pymolfile/molfile/include/expat/include",
-#                    "pymolfile/molfile/include/tng/include",
-#                    ],
-#                define_macros = largefile_macros
-#            ),
         ],
         py_modules=["pymolfile"],
         requires = [ "numpy" ],
-- 
GitLab