Show recurrence, change var names
Merge branch 'master' into d3