providing simple datastructures
Merge branch 'dev'