Merged in default (pull request #16)

Fix the unused variable warnings

Approved-by: Gary Kramlich