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