bug fix
Merge branch 'master' of github.com:Dwetech/Windowfreak1985