Reimplemented Robin's pull-request ;)

Fixes MOBBL-1078, as well as adding a method that was useful for a sample application