Merge master w/ test