delay ios callback until characteristics are discovered, fixes #1
remove trailing whitespace
remove trailing whitespace
resolve conflict