Merge branches 'pr/25' and 'pr/9'