Awesome feature

@mechamanny 
:smile