Merge pull request #61 from ipa-fxm/indigo_dev

cleaning up