Merges #59