Added some methods
Added a BiMap sample.
Example fixed.
Merge remote-tracking branch 'upstream/master'