Bugfix JavaScript
Final Version 3.0.0
Merge master to v3.0.0