Adding len check
Merge branch 'develop'