implement encode/decode
add missing pod files
return to last commit
merge from master