Changed parse method to use 1.8.7 style dcoding
Tests are working now