Updated and tested for 1.6.4. Closes #10