Merge pull request #2 from zfields/master

clear compiler warnings discovered after merge