added the new cool feature
Merge branches 'feature' and 'master'