added (hidden for now) call index/1
formatting issues
Merge remote-tracking branch 'fisher/master'