Updated description
Merged changes