Merge pull request #40 from ipa-fxm/indigo_dev

Indigo dev