slight changes
Merge branch 'master' of https://github.com/antsankov/cufcq_dev