Addeded new functionality !
Merge master into test1