Pull request at 2013-12-19

Pull request at 2013-12-19