Language now stored on attributes object

fixes #564
Merge pull request #636 from ebensing/language

Language now stored on attributes object