Merge branch 'master' into HEAD
reset to the sane version
fixed __init__.py