Merge https://github.com/abeaumont/jscl