Pull Request - Shar

Sorry late ako kanina.....