fix issue with auto-advance (closes #273)
Merge remote-tracking branch 'hakimel/master'