2011-04-26 Shingo W. Kagami Add ,h mapping.