Merge pull request #5 from MadisonReed/marshall

package updates
nits