Merge pull request #28 from supherman/javascript-fix

Javascript fix
Merge pull request #30 from supherman/installments-refactor

Installments refactor
Merge remote-tracking branch 'upstream/master'

* upstream/master: