Added one even more cool feature!
Merge remote-tracking branch 'uros/more-cool-features' into uros-great-feature