Added some features
Performed merge from master