Indicator generator v0.5
Merge branches 'indicatorgen' and 'master'