Merge pull request #1 from qtamaki/master

Pull Request test
Merge pull request #2 from qtamaki/master

Migrate for rails 3