Language fixes
merged alan changes
forgot master
Merge pull request #57 from ThomasRahn/Development

Development