Merge pull request #175 from way2muchnoise/1.7-update

fluid localization support