fix
fixes;
;
merge fixes
refactoring js
Merge pull request #39 from dyoachim/refactoring

Refactoring