I think I got it

Issue #18