Merge pull request #22 from ricsp/indigo-devel

Same as before for Indigo devel