Fix compile time errors
Merge branch 'master' of https://github.com/viksree/RubiksBackend