merge fix and language from 1.0.3