Merge pull request #5 from ipa-fxm/indigo_dev

Indigo dev