Merge of updates and bug fixes by @janlueders and @remailednet
Moved hard coded strings to language lib
Updated ReadMe