Fixed the bugs for skip/undo. I have not yet implemented the undo of a
skip.
merging
Merge remote-tracking branch 'origin/master'