Merge branch 'feature/5'

Close #5
added missing use, fixed undefined variable
Merge pull request #12 from apochatos/develop

added missing use, fixed undefined variable
Merge branch 'hotfix/12' into develop

Forward port #12