Merge branch 'dev'
test code containing os hasher added