Awesome feature

request to merge