Merge pull request #2 from ddb/master

Eliminating some warnings.