Fixed issues #10 and #11 - current directory is now properly set in file chooser