Added support for Scriptish