Merge pull request #4 from korpling/develop

Merge September korpling changes into amir-zeldes/ANNIS