Update to latest hama-gpu (merge)