Updated gems
Added comments and cleaned up
Merge pull request #2 from omegahm/clean-up

Clean up