Fixed initial service set up and advertising logic.
Merge pull request #1 from chrismiles/master

Fixed initial service set up and advertising logic.