File explorer master merge take 3

Completed Issues: #9, #10 
Old Pull Request: #46