Merge pull request #140 from Power-Maverick/no-bundle

Reverted to old unbundled version with package upgrades

Author: Power-Maverick