Merging your changes

Want to merge last changes