Merge pull request #38 from adamretter/master

Fix character encoding when reading files and minor GUI fixes