on par with 0.4.0-beta2
Merge pull request #128 from basz/docs

on par with 0.4.0-beta2