Issue #17. Fixed warnnings part two.