Update to version 2.6.18

Fixes #2.
Re-apply @patrickvob's getters/setters patch