1.3.2 - closes #7