Merge branch 'release/0.1.6' into develop
Merge branch 'master' into develop
fix karma testing

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>
Merge remote-tracking branch 'zvelo/master'