Merge branch 'dev'
fixed map_size not being const
updated README