Issue 92

Fixes Issue #87 
Fixes Issue #92 
Fixes Isse #86