Feature/153

fixes #153 
Didn't saw the feature, so I tried to make it more prominent.