configurable welcome message
Merge branch 'stable'