Merge pull request #62 from ipa-fxm/indigo_dev

Indigo dev