Removed warnings
Removed more warnings
Merge remote branch 'remote/master'