updates
nil check before encode
update with fix to encoder
Merge pull request #34 from BranchMetrics/mvp-features

Mvp features