Merge branch 'Master'
Added SMB support