""
Merge pull request #239 from mballance-sf/master

Misc bug fixes