Merge pull request #223 from mmargoliono/file-panel