Refactoring round.
Merge pull request #7 from xi-project/fucktor-round

Refactoring round.