adding exciting changes to Andrew's file
Merge branch 'master' of https://github.com/andreakal/bmc_test