Merge master/0.1.5