Pull Request 2 Dev 1.1