Refactoring
Merge pull request #11 from matscube/detail2

Refactoring