consolidated js
Merge pull request #42 from josiah85/v1.7.0

consolidated js