changed message
fixed typo
Merge remote-tracking branch 'origin/BUG-123_a'