Typo
Merge branch 'hardware'