cleaning up
Merge pull request #86 from ipa-fxm/indigo_dev

cleaning up