Small refactoring
Merge branch 'release'