Fixes Build
Merge branch 'master' of https://github.com/bfish713/rapid