Merge branch 'master' of github.com:teeple/pc_dev