fix #2, fix #5, release 1.0.7