lergo-526
Merge branch 'develop' of https://github.com/lergo/lergo-ri.git into develop