minor bug fixes due to plugin update
Merge branch 'master' of github.com:carepass/code-samples