Merge pull request #10 from kzhlin/branchB

implemented gem
updated fixtures
Merge pull request #11 from kzhlin/fixtures

updated fixtures