Merge branch 'hotfix/Issue#19v2'
Progress Issue#21
Merge branch 'hotfix/Issue#21' into develop

Conflicts:
	sorame_bot.pl