Added example + small bugfix
Merged.