Merge remote-tracking branch 'crosenth/master'
Merge pull request #10 from crosenth/master

cpu not threads