roll v3.0.1
Merge pull request #34 from neocotic/wip-3.0.1

WIP 3.0.1