Features that didn't make the cut in v3
Merge pull request #709 from gyozadoc/patch-1390342861

Features that didn't make the cut in v3