Adresses #138 - Replaced a few JS specific keywords.
Merge commit 'd46f07bc7b43da85faa8bd4080b776e57cf723f3'
Fixed typo in comment.