Merge branch 'issue-137' into dnsimple