Fixed software block bugs
Merge branch 'master' of https://github.com/dentuzhik/gas-analyzer-lab