merge 0.1.x to maser (0.1.1 `Eagle Ray`)