Merge pull request #3 from uditk/new

sync with kolaza:new
Merge pull request #4 from kolaza/new

Merge pull request #3 from uditk/new