working
fixed feelings too
Merge pull request #60 from wolves-2014/finetune-js

Finetune js