Add some new variables to unpacker
Merge branch 'adam_experimental' of github.com:me11/odmbdev into adam_experimental