Merge pull request #31 from myrle-krantz/develop

Removed some warnings.