I did a lot of things, I know this is not a good commit comment
a lot of things
Merge pull request #2 from blueonrails/general-changes

General changes