Dev 1.1 Second Pull Request

similar to my previous comments po