Merge pull request #23 from chuckdumont/master

pull phaseOptimizer and BundleResourceFactory fixes