Update to v2.3.1
Merge pull request #1 from luka5/master

update to v2.3.1