Re-committing changes after rollback
Merge branch 'clay-branch' of https://github.com/claykohut/Nomad5