Merge branch 'dev'
removed extern from struct defs