Merge pThumb-dev branch