Built rileyjshaw from commit a3d0794 on branch dev