Make builder instead of using strings twice
Merge branch 'develop'