Tema's additions
Merge branch 'master' of https://github.com/broartem/informational_system