Added support for indicator

I hope this is a correct pull-request, as this is my first .. :)