Update for 1.8 compatibility

Yay!
Update 1.6 compatibility issues
Revert "Update 1.6 compatibility issues"

This reverts commit bbfa0193127c82076f4989801279cfd6a1cac32b.
Update 1.6 compatibility issues
Update README