Feature/937 livescript

- [x] Ready to merge