v2.6.1
Merge pull request #4 from arbp/master

Merge changes.
Merge pull request #5 from ktekinay/wfs-master

Merge changes.