Fixes Issue 40
Fixes Issue 107