Solution for Issue #40

Try this please.
This worked for me.
Long live and prosper