Merge pull request #18 from mysterio56/master_qa

Master qa
Update default.js
Merge pull request #19 from mysterio56/master_dev

Master dev