.
Merge branch 'master' of github.com:apetrovskiy/STUPS
refactoring