Rename function and fixed unused variable (Closes #22).

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1'