Update to 2326, bugfixes
Merge pull request #1 from bboa/patch-2

Update to 2326, bugfixes