Removed warnings
Merged again @ ankit's comp