Fixed Warnings
Merge remote-tracking branch 'upstream/dev' into dev
Merge pull request #50 from jbradford/dev

Cleared up build warnings.