Merge pull request #134 from ndawe/master

[MRG] fix type warnings