#125 Upgraded JWrapper for improved user experience