Guava Optional support
Fix contributor formatting
Adding myself as a contributor