Merged last two commits

Merged mine and nikshi's commits