Pull Request 2 Dev 1.1

I think you can improve this if change the case here like you did in filter_by po :bow: