Influxdb: Part 2

This PR will finally fix #39.