Reconciled complex types resolves #51
Merge pull request #54 from sdalton1/master

Reconciled complex types resolves #51