Merge pull request #448 from hnyman/cpulabel