Thanks @garcia-jj this closes #32