Add unused variable warning and adjust code accordingly
Merge pull request #6 from dsyme/master

Add unused variable warning and adjust code accordingly