updated docs, fixed #170
Merge branch 'master' into 3.0
version 3.0.2