Added MarshalJSON method to registry
Merge branch 'arikfb-master'
go fmt