Resolve Issue #41

Resolve Issue #41 - Mostly, it can still cleanup a little bit more.