Merge pull request #11 from yongbok/master

Moving PRPL master into v2.2.0-rc1