import Subir's new version fix #1218 #1219

Closed belforte closed 9 years ago