Misc. Fixes
Misc. Fixes
Response to Issue #13