Fixing your pull request

This should make your pull request able to merge.  I have not tested it in the lab yet, but you should go ahead and merge it to your own repo, and I will merge it to the main repo once I verify that sunDemo is still working.