fix module definition
Bump version to: 0.2.25
Merge branch 'develop'
Merge branch 'master' into develop