Fixed some stupid mistakes (mine)
Merge remote-tracking branch 'upstream/master'
Added a fixed horizontal padding for text
Merge pull request #91 from hwdro/master

Fixed some stupid mistakes.