rm truncate
Merge branch 'develop'