Move network ID to end; decode T-/F- for FR24
"source"->"network"
Merge pull request #1 from sladen/master

Update