Merge some commits from developing
Fix #259
Some more merging(Language-Fixes)