Merge branch 'master' into beta
Merge pull request justcoding121#30 from justcoding121/master Beta
use interface as param