Merge pull request #3 from uditk/new

sync with kolaza:new