new dreaft
Merge branch 'master' of https://github.com/gabboshow/smartscope_files