Merge Master version
fix Map function