Pull Request - please accept my code ლ(ಠ_ಠლ)