Some small refactoring.
Enabled draw line using string and not only chars
Merge remote-tracking branch 'origin/master'