Merge branch 'master' into wip
Fixed typo
Added missing dependency
Merge branch 'wip'