Manual merge due to duplications. Closes #40