Importing changes from openAnasthesia

https://github.com/nischayn22/openAnasthesia/commit/b74190f7bdaf1af0185cdf2bbff02a914ab6334f#diff-d62eb7548fc1b5215743df806572af44
https://github.com/nischayn22/openAnasthesia/commit/439cb1dbe0716948707d852e3d987d929ffc8974#diff-d62eb7548fc1b5215743df806572af44