Fix all bugs
Fix js
Merge pull request #23 from anstak/master

Fix bugs