forward port #198 to indigo
Merge pull request #204 from mikeferguson/indigo-devel

forward port #198 to indigo