Merge pull request #22 from ricsp/indigo-devel

Same as before for Indigo devel
Added comments
Merge branch 'indigo-devel' into hydro-devel
use hydro in travis