Merge branch 'release/v0.1.24' into develop
removed support for option
Update Entity.scala
refactor
bugfix resolves function
Modified version
version up
Merge branch 'release/v0.1.25'