Merge pull request #5 from lushvino/master

Add json keys for re-encoding into json (ie: API Server)
remove log.Fatal

the presence of a call to log.Fatal causes applications that use this
library to exit abruptly on error.
Merge pull request #6 from ghedamat/mattia/remove-log-fatal

remove log.Fatal, pass err back up to caller