Merge pull request #19 from LeSpocky/v2.3

V2.3