Sketchy but WORKING :)

## v0.1.3202
## for Issue #42