Tyler - Fixed Warnings
Merge origin/master