2.4.0 - Closes #35.