Changed to fit 1.8 format. Fixes #64