Pull latest commit from jerry branch #36

Closed jeremyteh closed 6 years ago