Rework for issue000005
Merge pull request #5 from mikepaisner/Issue000005

Rework for issue000005
Loading All Src Except Package
Updating changes from Salesforce
added choice 7