Refactor by Magic issues.
Merge pull request #13 from macejmic/refactoring

1. Refactoring
Merge branch 'master' into devise