Cur/wy/dev

Pull Request 03/12/14