update/add/fix variable reference, claim
Merge branch 'development'