upgraded Mockito to 1.9.5
added some more examples for the Option matchers