Merge pull request #4 from korpling/develop

Merge September korpling changes into amir-zeldes/ANNIS
Merge pull request #361 from amir-zeldes/develop

Merge pull request #4 from korpling/develop