Renamed conn to connection
Merge branch 'master' into clean_deserialize
Updated channel deserializer to use reflection