Merge branch 'release/0.1.0'
Merge branch 'develop'
fix some build issues

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>
Merge branch 'develop'