Update to 2325
Merge pull request #33 from zdunex25/master

Update to 2325 - Polish