Merge branch 'feature/5'

Close #5
missing use flag, undefined variable fix
Merge branch 'master' into develop