Really ugly hack to handle interfaces in unmarshalling.
Merge pull request #22 from bwross/master

Really ugly hack to handle interfaces in unmarshalling.