Implement OnAway, close #21