port #445 to indigo
Merge pull request #538 from mikeferguson/port_445_to_indigo

port #445 to indigo