Fix app installation on Linux systems
Merge branch 'mjolnir' of git://github.com/SoumenG/r2d2b2g into SoumenG-mjolnir
fix style nits