Merge pull request #18 from ipa-fxm/indigo_dev

Indigo dev