Previous commit closes #148