Resolved overflow issue
Merge branch 'develop'