Merge pull request #22 from dhuyvett/master

Change to constructor and binary support ported from 2.x.x branch