Pull request 23-10-2013