Merge pull request #207 from tg-freigmbh/master

Buffer for more Speed