Finally implemented a working fix for issue #2

Also converted all .scpt files to .applescript