Javier Martinez - 2014-11-04

Hi, please see my answer in the patches section