Report and fix #167 and #166
Merge pull request #168 from calblueprint/howard/bug_fixes

Report and fix #167 and #166