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

Update to 2326, bugfixes