Initial second step of fixing GitHub issue #116.  Should now be able to decode catalogue and invoice scenario documents.