Proposal patch for v35
Merge pull request #6 from dolohow/unstable

Proposal patch for v35