GWTII 46

Pull request for issues GWTII-101 and GWTII-46.