Proposal patch for v33

New changese in the code base, might not work
Merge pull request #3 from dolohow/unstable

Proposal patch for v33
Merge remote-tracking branch 'origin/unstable'