Updates text label and improves resizing of the window
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from vgstef/master

Updates text label and improves resizing of the window