encode/decode functions added
App name shortened
Merge remote-tracking branch 'origin/master'