Pull Request 2 Dev 1.1

Done po. Thanks for this suggestion :+1: