Task #87 @15m fix warnings
Merge pull request #88 from DigitalBand/87

Fix warnings