Optional service when queried by name.
Bump version to v1.0.33
Bump version - remove flags.
Bump version to v1.0.35
Super Workaround... <puke>
Merge remote-tracking branch 'upstream/master'