20141230

Pull request for latest changes.