bring branch 0.1.0 into master