Manually merge pull #10's changes