Built rileyjshaw from commit cb90638 on branch dev