update from kk44 branch of vaniraosp (thanks xboxfanj!)