Rebase marshal.c
Merge pull request #17 from amlweems/rebasing

Rebasing marshal.c