fixed block size
Merge branch 'dev'