Fix the wrong variable name to function properly.

  This commit fixes #38.
Merge branch 'id/38' into dev