Prop commit
Merge branch 'master' of https://github.com/horiajurcut/quantum-app