issue fixed
font changed
issue done
Merge branch 'issue-13'
resolved conflicts while merging issue-14 into master