Merge pull request #9 from fareskalaboud/master

merge
fixed JS imports
fixed something in main.js
Merge pull request #4 from markormesher/master

merge