Merge branch 'release/1.0.23' into develop
[#97][dev] - added token model
[versionBump] - v1.0.24
Merge branch 'release/1.0.24'