Merge pull request #17 from ddb/master

Warning elimination