Merge pull request #38 from wigginslab/shikkic/startup-connector-update Shikkic/startup connector update