merge 0.1.x to master (0.1.2 `Striped Bass`)