Merge pull request #6 from MarcoRieger/master

update
Fixing Open File Dialog
Merge pull request #12 from johannesneuhold/master

Pull from Johannes to Marco