Merge PR 87 Co-authored-by: Jason Walker <[email protected]> Co-committed-by: Jason Walker <[email protected]>