macd attempt 1
Merge branch 'slave1' of github.com:vvarma/tr1 into slave1