Merge for PR #463

Merge of #463

I took my error message for now to resolve conflict, we can tweak them further later if need be.

"Fixed issues 7, 8, 10, 12, and 13 for #440"