Minor code update
Fixed standalone app
Merge commit 'a7e436052f1221e10bca44cf9ee2760fc57919d3'