refactoring
Merge pull request #1 from ondras/master

refactoring