RFT - move unmarshalling to util method with dynamic cast
Merge pull request #1 from lanwen/master

RFT - move unmarshalling to util method with dynamic cast