Merge pull request #18 from deemz0/master

resolved merge conflicts
Merge remote-tracking branch 'upstream/master'
Fixed user still having a path selected after logging out