Add bye feature
Merge from master