This PR looks good. Once the build issue is resolved I will merge it. 

Thanks for contributing!