Refactor.
Add missing buffer swap.
Merge pull request #8 from matfil/continue2

Continue2