import Subir's new version fix #1218
Merge pull request #1219 from belforte/master

import Subir's new version fix #1218