Overal waar cancel staat, is door Commit verkloot. overal merge conflicts staan er nog.
Some morge Merge Conflicts handmatic fixed.
Merge pull request #65 from zanax/master

Overal waar cancel staat, is door Commit verkloot. overal merge conflict...