Updated to 2.3
Merge pull request #3 from vania-pooh/master

Updated to 2.3