Built rileyjshaw from commit 64bac77 on branch dev