Merge branches 'issue-18' and 'issue-32'